From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1590490075; cv=none; d=zohomail.com; s=zohoarc; b=XNU6ZyGN+ISPvi0ZW8nA3/lnA+V3u9xUkomWLQs8K4q8YHV1C+pMQCf7yxw9UI7CvfEcJrvje3lnPI7mDnAY0df8kaJI7/IcbcLU4/88mKs1sW75XvRs/ka5wyK870lSz0TtyzAk9Ry3DTnl8QTY9YD5QjyQLDKYGngVbefZ4Y0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490075; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EByAZJAoFFtdeFOm6eReFE+ZTy/iIA5ZSOD5vs5S6WA=; b=XgdvDYGDnPjySd6UlOtLJFGXr8tB3v+GWTYStmXt8NqMBbl58Hglp4Z3erjNBku9NGeEhy16LCP1SM2YOA67U4lY1b3ThgokPM0yZ+1EajwwJGmmWGd0tXCu1E9R6zpgUuUFMxpKbJvXM3lrHFCTpdy2UaEhwHuv4vP+Dd2QdyU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 159049007586074.78393683576667; Tue, 26 May 2020 03:47:55 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-129-yaffWRitOxuoJ8upgg34Yw-1; Tue, 26 May 2020 06:47:52 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0FBC219057A1; Tue, 26 May 2020 10:47:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E457C6AD00; Tue, 26 May 2020 10:47:46 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C12DC62D04; Tue, 26 May 2020 10:47:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAli81029815 for ; Tue, 26 May 2020 06:47:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1F5775AB96; Tue, 26 May 2020 10:47:43 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 523735AB8D for ; Tue, 26 May 2020 10:47:40 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 21DF9101A525 for ; Tue, 26 May 2020 10:47:39 +0000 (UTC) Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-300-AvP2EuIvPVeGH4TKMK1l7Q-1; Tue, 26 May 2020 06:47:31 -0400 Received: by mail-ej1-f66.google.com with SMTP id o15so1909612ejm.12; Tue, 26 May 2020 03:47:30 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490074; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EByAZJAoFFtdeFOm6eReFE+ZTy/iIA5ZSOD5vs5S6WA=; b=LeTXWBrNGs22vRcGjo69m+jnesvk2cH8LatqZ2kfnh3MZ3O4MtiGenQm18VDWogiyXfdZN CSbI6HmID2Z8pJv4VwTjL5xslFrHZg4lbJc2inm18l4AnIsL1N6k8QuB8MadXYgqO75/88 InwJIt90Wj/0bKDYug7aux+4B2Sa9ek= X-MC-Unique: yaffWRitOxuoJ8upgg34Yw-1 X-MC-Unique: AvP2EuIvPVeGH4TKMK1l7Q-1 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=EByAZJAoFFtdeFOm6eReFE+ZTy/iIA5ZSOD5vs5S6WA=; b=CvEKMTzhoc07JBevKmuk4kngyC67YzmG8cgww2QdQrZR9SuEaMARgBHQ1qQ4Q3ojby yX2SVKUMM1C7eCwzvw+cc48B4Sy9JVvH+x6oRN9xrNu09JK4GxHo64CnUHmiEfGM/HRV 5lUGM5U+Qg23+cvUWTMH8h5hj/fayie/1heW8FVIQT+jXDTs4krbA7/Q+Iaog4XvnM8t hTu2y7CjYD2Uc3+VunSzCJhnWlv7RusM04QU8ZwKqA6fl5dkUt+TQeIB8VMCztsiApw0 BYb4C9n5JJ2UCPfLLS+9/dEOzOFdC18H6CxxFMEeBf133x5IoKoF76K81S1BeWK0TvWH Ll3A== X-Gm-Message-State: AOAM532dAEhEW5uISxkaU2BtEwYSO90jxPeRRaivTy+fe2A7xP586ZT3 8YrSwHV4IO8IfnViIU9wo5Q= X-Google-Smtp-Source: ABdhPJxMn7k1V8NNzV6+qNGwt3Xwk0fih0F7NPgNRvR1jI1qStLpQoIwhp+EyJmb9JETJBNxrH7b+A== X-Received: by 2002:a17:906:9714:: with SMTP id k20mr586763ejx.18.1590490049645; Tue, 26 May 2020 03:47:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 01/14] MAINTAINERS: Add Huacai Chen as fuloong2e co-maintainer Date: Tue, 26 May 2020 12:47:13 +0200 Message-Id: <20200526104726.11273-2-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Huacai Chen I submitted the MIPS/fuloong2e support about ten years ago, and after that I became a MIPS kernel developer. Last year, Philippe Mathieu- Daud=C3=A9 asked me that whether I can be a reviewer of MIPS/fuloong2e, and I promised that I will do some QEMU work in the next year (i.e., 2020 and later). I think now (and also in future) I can have some spare time, so I can finally do some real work on QEMU/MIPS. And if possible, I hope I can be a co-maintainer of MIPS/fuloong2e. Cc: Jiaxun Yang Signed-off-by: Huacai Chen Message-Id: <1586337380-25217-3-git-send-email-chenhc@lemote.com> [PMD: Added Jiaxun Yang as reviewer] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic Message-Id: <20200510210128.18343-2-f4bug@amsat.org> --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 3690f313c3..8f597aae12 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1082,8 +1082,10 @@ S: Obsolete F: hw/mips/mips_r4k.c =20 Fulong 2E +M: Huacai Chen M: Philippe Mathieu-Daud=C3=A9 M: Aleksandar Markovic +R: Jiaxun Yang S: Odd Fixes F: hw/mips/mips_fulong2e.c F: hw/isa/vt82c686.c --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1590490136; cv=none; d=zohomail.com; s=zohoarc; b=aQUzCXNB9ygMegnoT7c8ruyk1PxXdl4j6ipjs3IeXY+s0AT6hhMGY43aGJOXeSpj1JhOyM1dUG8bFM7SJRc3DVa9GD57bkxilkP1CDlElCU7hL+LhbD6YfPQpMA2/sB1ELe9+ojmA+uIF6RyEtflWmwaaISx+7llDi5w77Y75nI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490136; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZxmLzjQ4bUorljqYuWr6VmTgXnIbg6am868WkyxH1FQ=; b=a8G+jnpx741WodHiYDV6GgkwJyc41RiU6ncbhwqYl8/rFvFrC5d2Goewnwc4EfgpLbsvPMuxmFO36x/4U2iPeYK1qxRiBwrQaMiM7inocYBeIEzrtizunqvNR4A/ebudZ6xilohUDtSVjISXi8Xqkv502LtDtZZEm0P0KfS/jko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590490136923632.802847864711; Tue, 26 May 2020 03:48:56 -0700 (PDT) Received: from localhost ([::1]:58430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdX8h-0008Pa-MU for importer@patchew.org; Tue, 26 May 2020 06:48:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdX7N-0006ao-Ii for qemu-devel@nongnu.org; Tue, 26 May 2020 06:47:33 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:40345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jdX7M-00028L-QL for qemu-devel@nongnu.org; Tue, 26 May 2020 06:47:33 -0400 Received: by mail-ed1-x544.google.com with SMTP id l5so17244643edn.7 for ; Tue, 26 May 2020 03:47:32 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:30 -0700 (PDT) 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=ZxmLzjQ4bUorljqYuWr6VmTgXnIbg6am868WkyxH1FQ=; b=Hq7+a5ROzfKV7uz3FSsLHHmm2WPhIdUCq/MCNdaKbGTg/MndNp1iJbfpf5RiGipAMo Up3x6Jv3WG5iC1Vtvm2e0kA8fqZT1PJY20Y1cAV0LGoJk8k5orqtKnwFqe7vV2fuRyCi yn3rd8pChnZIShdhjK+DRlT8c0ak80QI6zd/eUqIpO0xDzin6ChpY+7crYMO+uzm3SR9 50QmsnJ2ujRnXWFlPEzql1LQSSdVt3OFpmHnKFm+uUfiS5yjzutXHL3Yl27WghkniwaZ HcEuc9DfWrohzczNsaCqXNaDq56uNd++9WFxxTCsX9IwyEPo0PD3DFI6pkVwnAXzSbLN o3Pg== 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=ZxmLzjQ4bUorljqYuWr6VmTgXnIbg6am868WkyxH1FQ=; b=JBUL9L5deO3Z8MbDVUv5IOU35v3nXm1/jkR2xsfaDl8+xNPM4EiyUsYdUEQXsXyPX6 iQJQ9nG4TZcePF5w60CZg6Ke37m28o/cwUnIOTWwlSki4o1CBYK4MQcsLtCkFi1LUcc+ FBCwy3o8YgZZsJNAc+ZsoVkoneAJJkZJWXYPFWT62vGvt3TvRJKAyZp3FCO0uxXUcg4a eImwNFlX0AmSfJsxUIwZPTP++8RX7i0nC3zTRDNZI+g+3sHViNcZc1/G7NtRbRIfznKW pVe5ZtifkNOoR5YIf4jxYwXwiWnyzROUrWWLgnJr9NMerIb71+19I8X0E3hKPUxTyQOL Wxrg== X-Gm-Message-State: AOAM533h0xd68PVQ/PTdf7aN2IUbbi4btjEpPpd/IipQDHol2x0A3dyj NdZOxQLd/72fE4esbJ8deTTf3WV7u38= X-Google-Smtp-Source: ABdhPJz3y81pWZAN2QDwX69MSEFuoyy3UyT/3VQZ7FbsGVsTwTvx9TXWg8Kiq5ikqCx8oF1YY0wNMA== X-Received: by 2002:a50:b2a1:: with SMTP id p30mr3467675edd.199.1590490051075; Tue, 26 May 2020 03:47:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 02/14] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge Date: Tue, 26 May 2020 12:47:14 +0200 Message-Id: <20200526104726.11273-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::544; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Ease the kconfig selection by introducing CONFIG_PCI_BONITO to select the Bonito North Bridge. Reviewed-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: <20200510210128.18343-6-f4bug@amsat.org> Reviewed-by: Huacai Chen Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/Kconfig | 1 + hw/pci-host/Kconfig | 4 ++++ hw/pci-host/Makefile.objs | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 2c2adbc42a..2240504dff 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -43,6 +43,7 @@ config JAZZ =20 config FULONG bool + select PCI_BONITO =20 config MIPS_CPS bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 9642c77e98..8db41edc7e 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -55,3 +55,7 @@ config PCI_EXPRESS_DESIGNWARE bool select PCI_EXPRESS select MSI_NONBROKEN + +config PCI_BONITO + select PCI + bool diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index 8c87e8494d..e422e0aca0 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -12,7 +12,7 @@ common-obj-$(CONFIG_PPCE500_PCI) +=3D ppce500.o common-obj-$(CONFIG_VERSATILE_PCI) +=3D versatile.o =20 common-obj-$(CONFIG_PCI_SABRE) +=3D sabre.o -common-obj-$(CONFIG_FULONG) +=3D bonito.o +common-obj-$(CONFIG_PCI_BONITO) +=3D bonito.o common-obj-$(CONFIG_PCI_I440FX) +=3D i440fx.o common-obj-$(CONFIG_XEN_IGD_PASSTHROUGH) +=3D xen_igd_pt.o common-obj-$(CONFIG_PCI_EXPRESS_Q35) +=3D q35.o --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1590490080; cv=none; d=zohomail.com; s=zohoarc; b=hefpQlB98TceI4A5/nqvk5qeDSotgu4g5wv07VqqexaKyD6lj4N7x9dt2W0Rfx9e/4RsCBpsw6q4h4b8SHs1LQzt7YWvuTYhuufxql430cwvTVzOCnD2geUSz84LhXf70Rc/rzBo3yeQcSPgQ9I4jciDXDFsZOQjZ91/8V+T8/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490080; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ggaqUitOgObz+chiNuLJcGpCPcKRZm0Lw0VDsUASAl4=; b=NsQUv1fhOGo7vsgcJ2FIrSD+vRGlrvWM8dVXUuJJXop5GqTHl/eKA3/PqIv/kq4VaL02ynn9T/rPxWH9haCKMTQJCyS/dnlDpmhyRYnqwxOHo6Fx8hNxbhw8spugg77BndJdDpYhmD7NO9K8IpHJnZSMSASr3a9vGSrDinwcKSs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1590490080008394.4207211869003; Tue, 26 May 2020 03:48:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-68-3cB0J0HDPm6mil6z_BlsOA-1; Tue, 26 May 2020 06:47:56 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD2B564AD2; Tue, 26 May 2020 10:47:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A24055D9E5; Tue, 26 May 2020 10:47:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 72A681809547; Tue, 26 May 2020 10:47:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAljQb029825 for ; Tue, 26 May 2020 06:47:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1323E5EDC6; Tue, 26 May 2020 10:47:44 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F5E95EDC0 for ; Tue, 26 May 2020 10:47:42 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 95C821859173 for ; Tue, 26 May 2020 10:47:42 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-91-8RxAl3ImMqSShHnTEQBI2A-1; Tue, 26 May 2020 06:47:34 -0400 Received: by mail-ed1-f65.google.com with SMTP id l5so17244698edn.7; Tue, 26 May 2020 03:47:33 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490078; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ggaqUitOgObz+chiNuLJcGpCPcKRZm0Lw0VDsUASAl4=; b=QhiQSezBCoy7qiJ4d5+Y6Xlyg8umM0nRl/jB7nB8HGGpLW4YQ4Aet7xJD0FxEFWEn1G86u LFW9jDZYEBZEr1kdst0Gjh0eCXrBJk9t7AV5tOCRWBDcz9OayriTRZpo6rW+qC3oEXcKkh Iujj24g5f1lSZ+nhle+Eib/3qcXyVdE= X-MC-Unique: 3cB0J0HDPm6mil6z_BlsOA-1 X-MC-Unique: 8RxAl3ImMqSShHnTEQBI2A-1 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=ggaqUitOgObz+chiNuLJcGpCPcKRZm0Lw0VDsUASAl4=; b=jZUZd1lzW6g7IPXgCyA+/wGBB0pPk/HsC4JoxNAzbodGPkzUbTeQUhjumEb2LNrFEa T7k/gs7CKcDcQCJkCSzrCMyFwgRFKno4f/IDoV+Zu177q1vQYqXbn/HBQm/1i2pfge4N ZJD3D+LFn/NTTZoeVZ0AOA830NxCpsDX7PccyD1TxsPqJ1QCmNKA5KZh6bsF9IRH8nxU k3DQ/Hmw+jyaVD5HC+TD7JD9gUzgpvgRyf1lkthLr5ZcPYTlLuHFn8k98yaWKeZEeObG PE3fTxmoRJWI2WcYM0eGI8ezUTHQgMqvSg6mFMxwQibLRlqdpX6PwnvIqC2QI/WgQ56b aisQ== X-Gm-Message-State: AOAM531y5vZEXD9BekmZDPHKe8Tr4tAHl/Rwzg/m16jKqgJjY0NW42+i FZaJXRU0JBosf0PI9RtbESA= X-Google-Smtp-Source: ABdhPJxy5Yt4QNhV3OrxDn1sBvjeygkmnp3F2ZNlxu6gBtX2nm7wc63EgImf+9mXXhiPNaXynTIxZQ== X-Received: by 2002:a50:fa8d:: with SMTP id w13mr18251047edr.280.1590490052422; Tue, 26 May 2020 03:47:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 03/14] hw/pci-host/bonito: Fix DPRINTF() format strings Date: Tue, 26 May 2020 12:47:15 +0200 Message-Id: <20200526104726.11273-4-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Reviewed-by: Huacai Chen Message-id: <20200510210128.18343-7-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index f212796044..b874468ea6 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -239,7 +239,7 @@ static void bonito_writel(void *opaque, hwaddr addr, =20 saddr =3D addr >> 2; =20 - DPRINTF("bonito_writel "TARGET_FMT_plx" val %x saddr %x\n", + DPRINTF("bonito_writel "TARGET_FMT_plx" val %lx saddr %x\n", addr, val, saddr); switch (saddr) { case BONITO_BONPONCFG: @@ -327,7 +327,7 @@ static void bonito_pciconf_writel(void *opaque, hwaddr = addr, PCIBonitoState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); =20 - DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %x\n", addr, val); + DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %lx\n", addr, val); d->config_write(d, addr, val, 4); } =20 @@ -474,7 +474,7 @@ static void bonito_spciconf_write(void *opaque, hwaddr = addr, uint64_t val, uint32_t pciaddr; uint16_t status; =20 - DPRINTF("bonito_spciconf_write "TARGET_FMT_plx" size %d val %x\n", + DPRINTF("bonito_spciconf_write "TARGET_FMT_plx" size %d val %lx\n", addr, size, val); =20 pciaddr =3D bonito_sbridge_pciaddr(s, addr); --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590490083; cv=none; d=zohomail.com; s=zohoarc; b=Cur8hMZLNUSLupt7tJ2WiH7krp6G6gX0wGETS1ECfs69LjfPpUiFFLzBKKTXLSUv841VP+fNpZZz4lBRLS5cuSm6nnOX1tDHn0T6FCh+1azX3Qy51kNxJWAciDcT4RXW83nq1JU7lNJvG3ZORQ+sEd+I7EYfYlzT46FsPiQCJc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490083; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ExVlN86Dv7JggIxvLUBjz5FHxHeWDg8nuqJ3/185rZA=; b=espbxEZTLNjZWOQ9koTQPQlyyiQbEP5SWRcbl8w11gyjT16SAMaXU+AClnb8q9nsvqRw8Lyih6y1d05uUZTiZp0jymAsiQikptrGAvR0e6snzssyULDdivTpjcBFD26oKPhYIybfVg1tumrW9Vh2rzWdU7rkic1aHmX6uYedsWc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1590490083356242.12338709121275; Tue, 26 May 2020 03:48:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-331-Nj1t7PAQPo6bCwPRY3YBMA-1; Tue, 26 May 2020 06:47:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A4AE864AD0; Tue, 26 May 2020 10:47:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 861C879C4C; Tue, 26 May 2020 10:47:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5AC8A65D0F; Tue, 26 May 2020 10:47:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAljwi029830 for ; Tue, 26 May 2020 06:47:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id B1DC810F8E19; Tue, 26 May 2020 10:47:44 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 529BE1000DA0 for ; Tue, 26 May 2020 10:47:43 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E9FC5833B47 for ; Tue, 26 May 2020 10:47:42 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-402-MY_3nysJMOypsaXCxdC4qg-1; Tue, 26 May 2020 06:47:35 -0400 Received: by mail-ed1-f66.google.com with SMTP id d24so17201931eds.11; Tue, 26 May 2020 03:47:34 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490082; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ExVlN86Dv7JggIxvLUBjz5FHxHeWDg8nuqJ3/185rZA=; b=LRfELkPnpLw7M7sqawwdvCy5eM6pzjoDj7pwC4DAmIJmGQxsR84GOfQRqy5IqPMPnrLBTB OTSaqCru+npGpnFe31agJx+s0EoqN0f6NXNITchfSmJJGRiLodmFmdBao5686nIeVnj7em w8Pkkrrb1HM0C7+TH9EEMx8he3RVA7Q= X-MC-Unique: Nj1t7PAQPo6bCwPRY3YBMA-1 X-MC-Unique: MY_3nysJMOypsaXCxdC4qg-1 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=ExVlN86Dv7JggIxvLUBjz5FHxHeWDg8nuqJ3/185rZA=; b=TVlSz43alaglDfr25gFcpPtIoH3wGpr2flkD112PAb6jimernwDTWZqB2Yuqm7igWc sxs8r643U8ldNwG8Tf+8QONBODRaLk5uZH6ZE7ZqV2aTZ2QKw+H/eATEmMgOt52ebWbM XmaRlDrJFSwk7XMdpt6TPBpnBdFpPmaYGGREngcp08PqHbFdm2W2WvYzU7mpDGwGad0D C7TFCPlurXWAeBmNgzD2Vqpriy0jG9/CJIDpAuCPSiRE1jSX/WT8Kl+D3WD45K9i+jQz /qLoxxp3iat2tLoP9mu5pdj31FQuo39tf0KsWD1ucjp/NYqI/6wsf9qBqgMM73ti5m3q +uaw== X-Gm-Message-State: AOAM533LNDUve4AocAzeQr2EkYKlyLfZFJ+wXKuly3a1eXmUljIHB0r6 JFMLPxB+NyQaxNWhtVIfzpY= X-Google-Smtp-Source: ABdhPJzHu36DajOmP5Yy+ZDR/NQuP7WVnBAlHlsYi1iESqNhjAYoDuAuPU3hfKvuG4eDjyRO6ncuEQ== X-Received: by 2002:a50:ed06:: with SMTP id j6mr18875441eds.209.1590490053806; Tue, 26 May 2020 03:47:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 04/14] hw/pci-host/bonito: Map peripheral using physical address Date: Tue, 26 May 2020 12:47:16 +0200 Message-Id: <20200526104726.11273-5-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Peripherals are mapped at physical address on busses. Only CPU/IOMMU can use virtual addresses. Reviewed-by: Aleksandar Markovic Message-id: <20200510210128.18343-8-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 b874468ea6..b90e5a636d 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -647,12 +647,12 @@ static void bonito_realize(PCIDevice *dev, Error **er= rp) 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, 0xbfe00200); + sysbus_mmio_map(sysbus, 3, 0x1fe00200); =20 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, 0xbfe00300); + sysbus_mmio_map(sysbus, 4, 0x1fe00300); =20 /* Map PCI IO Space 0x1fd0 0000 - 0x1fd1 0000 */ memory_region_init_alias(&s->bonito_pciio, OBJECT(s), "isa_mmio", --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590490084; cv=none; d=zohomail.com; s=zohoarc; b=VtVKv1T5i/3G4mG6urigOV7eEKrPR4FI7+NLjxELm0bM0uG8h/3Aqf3L2EJ3+UOUfTlTf+xEWDbClTZc8jgXc2L8KKfbOjQg6iJeIe7uKotWb1nzt0G1a89eJYZVhxq8l5uJUfvdXje8jxy1MbzBGJMOH7pE0sUCZ6S4tV9vKFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490084; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QG/Ao1FLrrqA3qiyJ5oTk9vVoadIo9/g3miLYRH/cTM=; b=aUiHfhi5Gp0nud1ff+SWPtAVD40Yy7WeHcr9wpAk2THk6EbnGQ9YzADOhMJlSwzy9uZl+d2VkXzYi4rD/RK0qiU+DTu0+5LrUMZvwdaA/EOiPN++YpeIb9zxPROkmbD8qO1wYHWds0lHy7K+/t609Y0+iXCoEqGVU2LsrERbS3w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1590490084860417.08530093721674; Tue, 26 May 2020 03:48:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-369-xtpncuG6P_aQRXhXZVzEag-1; Tue, 26 May 2020 06:48:01 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4FA1800688; Tue, 26 May 2020 10:47:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F93310013D7; Tue, 26 May 2020 10:47:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5EC176B494; Tue, 26 May 2020 10:47:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAlmgn029857 for ; Tue, 26 May 2020 06:47:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id A9417202696B; Tue, 26 May 2020 10:47:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A37AA202696C for ; Tue, 26 May 2020 10:47:46 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E9BB4833B45 for ; Tue, 26 May 2020 10:47:45 +0000 (UTC) Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-215-6al28QnoMYmxmLPpHDoz0w-1; Tue, 26 May 2020 06:47:37 -0400 Received: by mail-ej1-f66.google.com with SMTP id n24so23290251ejd.0; Tue, 26 May 2020 03:47:36 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490083; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=QG/Ao1FLrrqA3qiyJ5oTk9vVoadIo9/g3miLYRH/cTM=; b=dK9lQH7VzNgNCpn0/2ogy3diJU13x/RVWwCeXubN6tVeEnO2LfXGRwoZ3oJKvnS379Cue7 TJBv+GWTFRgESNUcOs2h9XvFOy8iDmtBhD/U4x5HKErQv9PiJCaACyKQSNB1AYYC5gFvi2 R92D0f7PeiJysnwW8CxBF2EX4H/u6Pc= X-MC-Unique: xtpncuG6P_aQRXhXZVzEag-1 X-MC-Unique: 6al28QnoMYmxmLPpHDoz0w-1 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=QG/Ao1FLrrqA3qiyJ5oTk9vVoadIo9/g3miLYRH/cTM=; b=Z8Wt8DNZJM/zlTsiSpA7+5c6qqiPgwutTGiofqUClJrLnE2/BS8UurPTbC3JyCEHvp chG6QcTXmhtBFi6vj3det8vu3NQxTB2QeaqVSeJeazUjAfRRjoBq47jtNpzhLF9xVgE5 T5TntH//PcWhqHNnNPpCboKdQAkb+rAc9QM7YFJ6aoOkaU8mtO5mEviWTSr0pxWHOe8r asTFjvsPDUFcdS2IAln1FztVMvhrn4HYeUnJGIJDxl7kjchCOvbKpGd6zEnX+m8aLso2 8/bGkTIt/wl8McKojDR5GlYsT48oob+vEk1gQ78FWPkg6gyj9zAXFCbaRdJhKYzh+/zK ndsQ== X-Gm-Message-State: AOAM530T4jH8o/MpIXICO7ED8NYR2I5f4czocXu5/UPd8JjuWdRgONxF IkAJFKY4GWaeoZ9jFJAEub5Rdy7owSc= X-Google-Smtp-Source: ABdhPJyoo+VtWtbHcSdXGZfsOYXDOW8z0e8hYTZTEy6Nhtq3mdrhXEUSSjZ4eLADOLWtHCCFNGEY3w== X-Received: by 2002:a17:906:81ce:: with SMTP id e14mr553124ejx.76.1590490055287; Tue, 26 May 2020 03:47:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 05/14] hw/pci-host/bonito: Map all the Bonito64 I/O range Date: Tue, 26 May 2020 12:47:17 +0200 Message-Id: <20200526104726.11273-6-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) To ease following guest accesses to the Bonito64 chipset, map its I/O range as UnimplementedDevice. We can now see the accesses to unimplemented peripheral using the '-d unimp' command line option. Reviewed-by: Aleksandar Markovic Message-id: <20200510210128.18343-9-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 3 +++ hw/pci-host/Kconfig | 1 + 2 files changed, 4 insertions(+) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index b90e5a636d..f09bb1c6a8 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -48,6 +48,7 @@ #include "sysemu/reset.h" #include "sysemu/runstate.h" #include "exec/address-spaces.h" +#include "hw/misc/unimp.h" =20 /* #define DEBUG_BONITO */ =20 @@ -644,6 +645,8 @@ static void bonito_realize(PCIDevice *dev, Error **errp) sysbus_init_mmio(sysbus, &phb->data_mem); sysbus_mmio_map(sysbus, 2, BONITO_SPCICONFIG_BASE); =20 + create_unimplemented_device("bonito", BONITO_REG_BASE, BONITO_REG_SIZE= ); + memory_region_init_io(&s->iomem_ldma, OBJECT(s), &bonito_ldma_ops, s, "ldma", 0x100); sysbus_init_mmio(sysbus, &s->iomem_ldma); diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 8db41edc7e..036a61877a 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -58,4 +58,5 @@ config PCI_EXPRESS_DESIGNWARE =20 config PCI_BONITO select PCI + select UNIMP bool --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590490088; cv=none; d=zohomail.com; s=zohoarc; b=C69T8y18SGNMwtqJxf8hMhTLUFHMWrH70VdG5qz5mhDecWWJiU+UNNpFHAuQiJOkreexm2BHa/93aABQOipmUWbNWe5CSHo12TI3mV8Hk/IdVdsjYE5dhLvaON8ovNy60Gq2wgxUuR+L3DHbn+08IClUquiC8YYeznh43s869PY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EBoNHrdrDyvUbiQ9fa2MJcvDvpC5sCF/C8lSyKTb4Pg=; b=W4fwpqz19D8s+wkkrPz3B/yOGcWrd42h33XHUPewnYpP0lS56s08G0N5vWXCuEKr5Tb7c7WqtU30ro0ktsYTh3ZdWT9T54khWOsbqsuOT0QaZoYKnsI+egtwz1HayNFN18Ui1EiknKE9nQNB1FymRP+xY2RowYVvTbHM7NXn8g4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1590490088204884.9164993449482; Tue, 26 May 2020 03:48:08 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-203-m6Z4CCEAOMifTl6b0lEBPQ-1; Tue, 26 May 2020 06:48:04 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0703F100CC86; Tue, 26 May 2020 10:47:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8DC43C70; Tue, 26 May 2020 10:47:57 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A960B1809554; Tue, 26 May 2020 10:47:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAlmOJ029861 for ; Tue, 26 May 2020 06:47:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id ADBDF2029F71; Tue, 26 May 2020 10:47:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A94B320110D9 for ; Tue, 26 May 2020 10:47:45 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5C5A880066A for ; Tue, 26 May 2020 10:47:45 +0000 (UTC) Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-43-YWHkU9jlMLe2AG5Qqeileg-1; Tue, 26 May 2020 06:47:38 -0400 Received: by mail-ej1-f67.google.com with SMTP id y13so1333921eju.2; Tue, 26 May 2020 03:47:37 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490087; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EBoNHrdrDyvUbiQ9fa2MJcvDvpC5sCF/C8lSyKTb4Pg=; b=a8RZYqFu+DHQ4dHH3kXUhUylxb1hT91Gg3tN7sZys4dTtZ7XJaipF5+EuZGR2rLImgWArO XpCgsQCrXHuQFQUq8Wo9JHJ36BHH/QojtOAeQi4kyPQUK7lsB8MqfyT/ckMT7UgLTpzaVM qZgt8Bu3QjUxa6pixCMI3l5kOxWUmXI= X-MC-Unique: m6Z4CCEAOMifTl6b0lEBPQ-1 X-MC-Unique: YWHkU9jlMLe2AG5Qqeileg-1 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=EBoNHrdrDyvUbiQ9fa2MJcvDvpC5sCF/C8lSyKTb4Pg=; b=XVu2wzHys/AzbJdStC2CF9m4xv20cpM3+lETJUjOQB+vzVFELOxNPo2bdDIKXkx2tD oDjv+n6ABRgpyidcS/eWySipHrcRCLJ39vVoJgcGNuD8fiq5XPUr3KJOIcCejjM8/6CC B2yA4yCHgNR9Bt4W7c4GzUGmtVBwzndSw7JgQKqCqE/Vd3kHrVl6wJp5ppgGu0AFvymX 7iUyF439fP30c/Wty9MX67fycg9kIV/H2F28aRAYHX4CHzhZd7Xi8FrCmjzo3iaNrsU9 zIipREdXAXdtuT91CVKSBgcPS7KgfV8Mvej6Lc2LRGIODe1Tquwc1j6QVOXskbUNrOEi 4jNA== X-Gm-Message-State: AOAM532GhwdJGJQrDaM2UVeCo4W/0QPYeP2LF0vlxVX53sDvlxV7kJdR cbvU1wl0sikdveyieNw8R4o= X-Google-Smtp-Source: ABdhPJzrZGxiuixgK5Ees0G9MM1yyHNLbdJSdf/vdsELI0edNnmGhRFuZZw5qB3FKTP/ahPwb4cfjA== X-Received: by 2002:a17:906:a1c9:: with SMTP id bx9mr519464ejb.496.1590490056746; Tue, 26 May 2020 03:47:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 06/14] hw/pci-host/bonito: Map the different PCI ranges more detailled Date: Tue, 26 May 2020 12:47:18 +0200 Message-Id: <20200526104726.11273-7-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Better describe the Bonito64 MEM HI/LO and I/O PCI ranges, add more PCI regions as unimplemented. Message-id: <20200510210128.18343-10-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- hw/pci-host/bonito.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index f09bb1c6a8..52015cc2a7 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -39,6 +39,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "hw/pci/pci.h" #include "hw/irq.h" @@ -82,7 +83,7 @@ #define BONITO_PCILO1_BASE 0x14000000 #define BONITO_PCILO2_BASE 0x18000000 #define BONITO_PCIHI_BASE 0x20000000 -#define BONITO_PCIHI_SIZE 0x20000000 +#define BONITO_PCIHI_SIZE 0x60000000 #define BONITO_PCIHI_TOP (BONITO_PCIHI_BASE + BONITO_PCIHI_SIZE - 1) #define BONITO_PCIIO_BASE 0x1fd00000 #define BONITO_PCIIO_BASE_VA 0xbfd00000 @@ -605,14 +606,26 @@ static void bonito_pcihost_realize(DeviceState *dev, = Error **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_PCILO_= SIZE); + 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, dev, &bs->pci_mem, get_system_io(), 0x28, 32, TYPE_PCI_BUS); - memory_region_add_subregion(get_system_memory(), BONITO_PCILO_BASE, - &bs->pci_mem); + + 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 static void bonito_realize(PCIDevice *dev, Error **errp) @@ -620,6 +633,8 @@ static void bonito_realize(PCIDevice *dev, Error **errp) PCIBonitoState *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 /* * Bonito North Bridge, built on FPGA, @@ -652,6 +667,7 @@ static void bonito_realize(PCIDevice *dev, Error **errp) sysbus_init_mmio(sysbus, &s->iomem_ldma); sysbus_mmio_map(sysbus, 3, 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); @@ -669,6 +685,14 @@ static void bonito_realize(PCIDevice *dev, Error **err= p) sysbus_init_mmio(sysbus, &s->bonito_localio); sysbus_mmio_map(sysbus, 6, BONITO_DEV_BASE); =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.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590490083; cv=none; d=zohomail.com; s=zohoarc; b=bdFTnmlfDGVS8tzE1oqrHVI+gxnVJh6xF6HezooF5z6OT9SWbJcOuqXHg0RNPfh7qqY/4DagGKyE17cBTEAEp0TGQPNuifrK8Xy/5y5IJsSAXma3avRUE3VuEwAob5MmJiCJTCbG3c0spugRXRhvvcySbC7ZozJNAyUOmVY7kkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490083; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W8VxI71hr8dlU8kpN6GleuQ2+cio9Eeh3dClavw718g=; b=Fy0l57uyEVKne4oMhuelB7CEIz9/cqn5TqJcrEgDFzBbpDWe8vcjfrgbmghfO8WlY3/7IJjcEETEPYMgAJLnOQvw04gkcl2c6W4EdBwkWvBDC2U5NjVhCVL9uPYk5JlxNw/n7ecBG8Y688PjYueWE2QnhxciPmVk9pIB3+1cLnQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1590490083360835.962008866269; Tue, 26 May 2020 03:48:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-492-w1z7GkZcNhm-I_bIkIZeqw-1; Tue, 26 May 2020 06:47:59 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 354C364ACA; Tue, 26 May 2020 10:47:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E61676AD00; Tue, 26 May 2020 10:47:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B95B8180954D; Tue, 26 May 2020 10:47:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAlmdY029860 for ; Tue, 26 May 2020 06:47:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id ACE622029F6F; Tue, 26 May 2020 10:47:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8346200A773 for ; Tue, 26 May 2020 10:47:45 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9DCCE833B4F for ; Tue, 26 May 2020 10:47:45 +0000 (UTC) Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-461-cBUaf85COIqDlEPHiU08AA-1; Tue, 26 May 2020 06:47:40 -0400 Received: by mail-ej1-f65.google.com with SMTP id l27so1164886ejc.1; Tue, 26 May 2020 03:47:39 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490082; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=W8VxI71hr8dlU8kpN6GleuQ2+cio9Eeh3dClavw718g=; b=LOagt7Fr+LzhX5gqZKBZYnTZ1nSdt844MK66/pEDLemvE/w309ss7t65cpTaicnczsULZC 5UN0KQqh0eHMH5VwtUnkL6YQ5sjtY7ekUNm93wUphRPucTXrU1OpnHYei5ARDocXMYOiwG Ebrin9F6+YRoJytMvcKcIQ9pEF8od2c= X-MC-Unique: w1z7GkZcNhm-I_bIkIZeqw-1 X-MC-Unique: cBUaf85COIqDlEPHiU08AA-1 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=W8VxI71hr8dlU8kpN6GleuQ2+cio9Eeh3dClavw718g=; b=KsqPmfyd8UTWizouLghQDedix0jRGeQww2eAdC/rCTMwdHir8j73xduEA8sNKAwqj6 QIpSTUOhhUI1dLEHsI4o2IRfP51Fj+x4qy0nrk/JknUTP/6zEH8cZVby/mZzPe6/h22j ECycbgHYYmIFVX007mkZHsHRaXHoWFA3ujGb+Kv0m9R3wfBMat+Y0qnHeyUUbW8UQ3mI XFCaNGoYQEBq79UxUHrdtwXprzf6KqAEOjEPjDWzZe5vSRaJhY3rk8oE4zIVv0Xcdf4T wRYkvJUSIfUMRXilAE6QTttQsNOSKFIaQr+4tae61zsxLPBNqo3MSwClRjUgRg8NewtR HzCA== X-Gm-Message-State: AOAM530e5xW/MyvHU4mHGc8vNtR/nM5UNT1GnSBsHkRyqyjkSeSS0fOF Vg24lhjCVNS/6lAHypSYYog= X-Google-Smtp-Source: ABdhPJysxEIj5mQJcqunjHYD14fn4IkDf5j5oqnDQLPJI7jYdR0p7CfygqX2pBbp92IoN5Y/5iaf7g== X-Received: by 2002:a17:906:f208:: with SMTP id gt8mr533561ejb.358.1590490058229; Tue, 26 May 2020 03:47:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 07/14] hw/pci-host/bonito: Better describe the I/O CS regions Date: Tue, 26 May 2020 12:47:19 +0200 Message-Id: <20200526104726.11273-8-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Better describe the I/O CS regions, add the ROMCS region. Reviewed-by: Aleksandar Markovic Message-id: <20200510210128.18343-11-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 52015cc2a7..20f2797a73 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -673,6 +673,8 @@ static void bonito_realize(PCIDevice *dev, Error **errp) sysbus_init_mmio(sysbus, &s->iomem_cop); sysbus_mmio_map(sysbus, 4, 0x1fe00300); =20 + create_unimplemented_device("ROMCS", BONITO_FLASH_BASE, 60 * MiB); + /* Map PCI IO Space 0x1fd0 0000 - 0x1fd1 0000 */ memory_region_init_alias(&s->bonito_pciio, OBJECT(s), "isa_mmio", get_system_io(), 0, BONITO_PCIIO_SIZE); @@ -680,10 +682,17 @@ static void bonito_realize(PCIDevice *dev, Error **er= rp) sysbus_mmio_map(sysbus, 5, BONITO_PCIIO_BASE); =20 /* add pci local io mapping */ - memory_region_init_alias(&s->bonito_localio, OBJECT(s), "isa_mmio", - get_system_io(), 0, BONITO_DEV_SIZE); + + 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); + create_unimplemented_device("IOCS[1]", BONITO_DEV_BASE + 1 * 256 * KiB, + 256 * KiB); + create_unimplemented_device("IOCS[2]", BONITO_DEV_BASE + 2 * 256 * KiB, + 256 * KiB); + 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); --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590490091; cv=none; d=zohomail.com; s=zohoarc; b=BSGjrVIYICJk6RkYwvS9DW0gvWQBYhRwy+5G+VhJDAZs22pPV2Mp0lGfBJz9p308wSleAaRSbTC86/sByIDzQa6d8kq+Z6Ti9pAfxTMDo5901I3lk9ry5fvbwXekyef2DMdVEV2O2BTVg7KNFbDIyjBfOiZsddfkeXg/9eoBp6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490091; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mBHAYQ31sriu1PFVXi6ty+G9pR4qR9G0hm00u+LnXSk=; b=Umd1IsTIi7Qx5rxKBRSMhUVbMEWcjmkZXz7krbuGZAcsOgc8CL0xZ99/4+NDdbpNK/8Uv7ODQvCQq5B81jWE8wagsT+tHV9c3AtvBn7OGqZbxo8RHyk/MC1wXRWKWFVRDkZVgFErMQwnCMajqgW6YlhGHsn82MjxriHGGQiMt6A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1590490091883349.24273853797945; Tue, 26 May 2020 03:48:11 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-342-Yra9nkIdMkWpfwi9x-DLVQ-1; Tue, 26 May 2020 06:48:08 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3E0F100CC90; Tue, 26 May 2020 10:48:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 951168ECE0; Tue, 26 May 2020 10:48:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 62FB01809543; Tue, 26 May 2020 10:48:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAloSc029906 for ; Tue, 26 May 2020 06:47:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0BC8D2156A3A; Tue, 26 May 2020 10:47:50 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0756B2166BA4 for ; Tue, 26 May 2020 10:47:47 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 457938007DF for ; Tue, 26 May 2020 10:47:46 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-473-P5HB6veIO9SykWvRrrItYw-1; Tue, 26 May 2020 06:47:41 -0400 Received: by mail-ed1-f66.google.com with SMTP id c35so924044edf.5; Tue, 26 May 2020 03:47:40 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490090; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=mBHAYQ31sriu1PFVXi6ty+G9pR4qR9G0hm00u+LnXSk=; b=fVMOImlg9vSCdmmDI/2XTRli7NCOW8KbZPbPzOeMxBHVsiXUKV9ELt9O0rsUM07/0hzN44 X8ncZtxXNA5rZCR/Dz+Pj/eYD17iBP7rwZi/M0P6vEvUGBnQ5wM6au9kgj6PwNl4SVviDE ouZ4V+fCsGUkHBhyegpmpip/VvYddcA= X-MC-Unique: Yra9nkIdMkWpfwi9x-DLVQ-1 X-MC-Unique: P5HB6veIO9SykWvRrrItYw-1 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=mBHAYQ31sriu1PFVXi6ty+G9pR4qR9G0hm00u+LnXSk=; b=iozB8UegZ5oLYPFuoRtLZkxur8Kc3je7X5K2E5bMFd3No/f0ZtrJkuIiWHtpuOdi5r bIym6eHqLTo1OncWlelFr8TPPrCht5X7W8SpQNZ7Uv5zNBJ1FxGPqpAlsZVxDeDO42Bs jdKrNZxH87B7AlpPRn2AouGmmCtVu2KsWS0eAiJEca8hZShUeMbFNpN0SYHE4YFdsT3V jct32joemOdFJXVye6nugFdr+dNyCxmhCyYhFutFNYPKzR0/oPhDmjv+tBCMCRC13HH+ 8fQdEFrWla/3VtH0tBMO2yP6AsA8JZsqJ8lOZICMbKprRfTxqZHk5AXsxHMtNf0nhxmB LzVg== X-Gm-Message-State: AOAM533xAGBTHmdsGZMuCpHDCi20hcItVujlax5UL7zQ/2GANaQAzH0b T0bS2494gEMCnCmGUCMMvGw= X-Google-Smtp-Source: ABdhPJx7A+aavnv8UeQ4jpnozPyWIgFVnM/s5spYdycN2n/BTeZlrr2nQOg/S3Ha68qtTyHrtE932w== X-Received: by 2002:a50:bb07:: with SMTP id y7mr18652600ede.176.1590490059616; Tue, 26 May 2020 03:47:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 08/14] hw/pci-host/bonito: Set the Config register reset value with FIELD_DP32 Date: Tue, 26 May 2020 12:47:20 +0200 Message-Id: <20200526104726.11273-9-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Describe some bits of the Config registers fields with the registerfields API. Use the FIELD_DP32() macro to set the BONGENCFG register bits at reset. Reviewed-by: Aleksandar Markovic Message-id: <20200510210128.18343-12-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 20f2797a73..d0201ce59e 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -50,6 +50,7 @@ #include "sysemu/runstate.h" #include "exec/address-spaces.h" #include "hw/misc/unimp.h" +#include "hw/registerfields.h" =20 /* #define DEBUG_BONITO */ =20 @@ -112,8 +113,19 @@ /* Power on register */ =20 #define BONITO_BONPONCFG (0x00 >> 2) /* 0x100 */ + +/* PCI configuration register */ #define BONITO_BONGENCFG_OFFSET 0x4 #define BONITO_BONGENCFG (BONITO_BONGENCFG_OFFSET >> 2) /*0x104 */ +REG32(BONGENCFG, 0x104) +FIELD(BONGENCFG, DEBUGMODE, 0, 1) +FIELD(BONGENCFG, SNOOP, 1, 1) +FIELD(BONGENCFG, CPUSELFRESET, 2, 1) +FIELD(BONGENCFG, BYTESWAP, 6, 1) +FIELD(BONGENCFG, UNCACHED, 7, 1) +FIELD(BONGENCFG, PREFETCH, 8, 1) +FIELD(BONGENCFG, WRITEBEHIND, 9, 1) +FIELD(BONGENCFG, PCIQUEUE, 12, 1) =20 /* 2. IO & IDE configuration */ #define BONITO_IODEVCFG (0x08 >> 2) /* 0x108 */ @@ -577,11 +589,18 @@ static int pci_bonito_map_irq(PCIDevice *pci_dev, int= irq_num) static void bonito_reset(void *opaque) { PCIBonitoState *s =3D opaque; + uint32_t val =3D 0; =20 /* set the default value of north bridge registers */ =20 s->regs[BONITO_BONPONCFG] =3D 0xc40; - s->regs[BONITO_BONGENCFG] =3D 0x1384; + val =3D FIELD_DP32(val, BONGENCFG, PCIQUEUE, 1); + val =3D FIELD_DP32(val, BONGENCFG, WRITEBEHIND, 1); + val =3D FIELD_DP32(val, BONGENCFG, PREFETCH, 1); + val =3D FIELD_DP32(val, BONGENCFG, UNCACHED, 1); + val =3D FIELD_DP32(val, BONGENCFG, CPUSELFRESET, 1); + s->regs[BONITO_BONGENCFG] =3D val; + s->regs[BONITO_IODEVCFG] =3D 0x2bff8010; s->regs[BONITO_SDCFG] =3D 0x255e0091; =20 --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590490081; cv=none; d=zohomail.com; s=zohoarc; b=S2mgZH2imjME26HXczNXANCUgLaO6d5tDo/jaFCEZfnytxt/iZaL363Lm44h0nOTP6I0z3EeOboFCT8eW5r6L0zf70nZlvwDjsqKWYJ+b17xtX946Rzmnxo7GKshzg2wDmEKjhe+1Oco+QcRBJBObI2D2g/er9wz3SB81L3PMP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490081; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O0RMe/KIBJnQN5FAGIPVddGSupuK4ETk0arXsanrJz8=; b=Haiw3b6wNB/nXfgkWJV8CZiGlnUFrccf79FvdCqjcGdeXgSz4fTusytfsvH3yYk2jELX6RRsi0AYpj+xaud5Xbi+0pH5hSi2jJfSjHPTnc6PxQLh8SF1ZGm30Hsh2ofp9rll1Mq56qtYkwUlipRyAEujVYnAQ3O08srrizhBdys= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1590490081951587.0452955587452; Tue, 26 May 2020 03:48:01 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-392-OLndHGmUOWKoHwd3333icw-1; Tue, 26 May 2020 06:47:58 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6673108BD0B; Tue, 26 May 2020 10:47:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B58826FB76; Tue, 26 May 2020 10:47:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 72E511809557; Tue, 26 May 2020 10:47:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAlode029911 for ; Tue, 26 May 2020 06:47:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 38F2C202696B; Tue, 26 May 2020 10:47:50 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 352252026E1C for ; Tue, 26 May 2020 10:47:50 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1A7E980066A for ; Tue, 26 May 2020 10:47:50 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-356-KEcHtW8-Pp6ckA5rQvsVyw-1; Tue, 26 May 2020 06:47:43 -0400 Received: by mail-ed1-f66.google.com with SMTP id g9so17229214edw.10; Tue, 26 May 2020 03:47:42 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490080; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=O0RMe/KIBJnQN5FAGIPVddGSupuK4ETk0arXsanrJz8=; b=FaG49fn+A/Tr8BikdwaVSacOg+c9LYpvAgHnv3RKxTDoN+TCmXqrmwADpL+XijMgVtqt2b Dz524fbYteP4NHr2TJ9ycMWJLKUAq+bCQhUSqLh2Kpxa6CRoJzx8qrrmUV4uAp5M1N9+6z 6Nl3B0ZEtYFRaq1grqLZUF7J+q7yu1E= X-MC-Unique: OLndHGmUOWKoHwd3333icw-1 X-MC-Unique: KEcHtW8-Pp6ckA5rQvsVyw-1 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=O0RMe/KIBJnQN5FAGIPVddGSupuK4ETk0arXsanrJz8=; b=YV2mzVLvFqHwnN6QDcCvhIspM90OQv4tImORISOqn4BaTenSLUd10Tr3DsZ0HpXCf/ pzKwMiYLq7VxeH3fRcakqKJnoTK4IrRdFn91gkY8XD7/353XFMaXbOn4W0+EdaWAmM/R vcse7NOSZuTeETQf7hGkrfHHAAudXEMoi8ZK0UpZb2Pw2/X/q+pZqlFCbxjq8NxDbqMB tPJGoHL6Zl2UhcPvXAi334iYojZb31F0LJgJkOm7rlxGjL1Bjevu3Wz1b5xYyIjfZlGq srKC2LqySKbvlN4FmstzleEpo+KtUBhFK0Y8w+dBauOuW0VvcTb/qDQ3WtAYwRGOVlbX VrcA== X-Gm-Message-State: AOAM531iHXJWmZtJZavDuVbFCm4zbHcgsBxNAunK//Rrc0V5O4URtvxk QxQtungYI9WfV11VbEvpwJo= X-Google-Smtp-Source: ABdhPJyyAHRwvz1QFqRke0gd34JWn3GXI8WomKQHJsrtEZW5IitbO859IkEZ7qbYfUjNEdXttrAzog== X-Received: by 2002:a50:955a:: with SMTP id v26mr19533154eda.5.1590490061184; Tue, 26 May 2020 03:47:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 09/14] hw/mips/fuloong2e: Move code and update a comment Date: Tue, 26 May 2020 12:47:21 +0200 Message-Id: <20200526104726.11273-10-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Move the RAM-related call closer to the RAM creation block, rename the ROM comment. Reviewed-by: Huacai Chen Message-id: <20200510210128.18343-4-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/mips_fulong2e.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 05b9efa516..6996f5e3d1 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -315,12 +315,11 @@ static void mips_fulong2e_init(MachineState *machine) error_report("Invalid RAM size, should be 256MB"); exit(EXIT_FAILURE); } + memory_region_add_subregion(address_space_mem, 0, machine->ram); =20 - /* allocate RAM */ + /* Boot ROM */ memory_region_init_rom(bios, NULL, "fulong2e.bios", BIOS_SIZE, &error_fatal); - - memory_region_add_subregion(address_space_mem, 0, machine->ram); memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); =20 /* --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590490096; cv=none; d=zohomail.com; s=zohoarc; b=h9xTNlUTdqEOKTfASL1MI1h7td7mVM5rIbN0udkUALJ1WAnMbs6demEA/AxL5btwmhDf8EqpcCvePhRsyzkQD00Uodwpr0zasPHzbzcHIqFAQ3AzJDN87J00+CAADe+f8icZHdXZfN8bJ9zK+Z2j532P7bHK9UwImx8NFKdDR2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490096; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Zt3NGcbexO6A3j4Pp4sNR582d+oR5aMY1t+EX1xMPMU=; b=huhxadmSXvZ+LSQC+XwGkfeyDRtOuFKcI6HCvkwMBA5en+WjJPiDVLXImAmX3HUg/yMC4m74P1HspjEsvDDuzVPcSDCz97EVqivoXs+cPdTDgG2BV4N2Ybp2L6dXVUkclyL1RbsDxQOjLsPkgfwOWvSlAqvf/i7QjcrzC4mFnDA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1590490096558306.0031839828556; Tue, 26 May 2020 03:48:16 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-215-Ghkyp8BoP7ez2IwU1k4tUA-1; Tue, 26 May 2020 06:48:12 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A338080B733; Tue, 26 May 2020 10:48:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 105936ED99; Tue, 26 May 2020 10:48:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D5C6F6B4E6; Tue, 26 May 2020 10:48:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAloqt029905 for ; Tue, 26 May 2020 06:47:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0BB8A2156A2D; Tue, 26 May 2020 10:47:50 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0741E2166BA0 for ; Tue, 26 May 2020 10:47:49 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C29A31859160 for ; Tue, 26 May 2020 10:47:49 +0000 (UTC) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-461-eU0hFyAcPgCyk7Cabq-qhQ-1; Tue, 26 May 2020 06:47:44 -0400 Received: by mail-ed1-f68.google.com with SMTP id d24so17202262eds.11; Tue, 26 May 2020 03:47:43 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490095; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Zt3NGcbexO6A3j4Pp4sNR582d+oR5aMY1t+EX1xMPMU=; b=U09WhI7BjUWrbd624hUjrY9WVjDVV6lnaf66xN57aNq2mPk8rM8N+eYbaZxqouaN6MggAd qkldaGHkohAt84GTrZVljfY/my9lmtkD6Wx+xPnZRfcAk6SRyvF4HKWC6rAajJ0wRyxE4f Gbn6J7/UwvMMbKfbB1tebQTxRsX33Xw= X-MC-Unique: Ghkyp8BoP7ez2IwU1k4tUA-1 X-MC-Unique: eU0hFyAcPgCyk7Cabq-qhQ-1 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=Zt3NGcbexO6A3j4Pp4sNR582d+oR5aMY1t+EX1xMPMU=; b=mZcx6c7MCdJ8BTHzqfns8b5EFFYHC7v/NfKJqY4gibI0WizWzkBR0qcvWarGZzPv6H R6wAwqN8iJmfY2gDHjiLsHJxbDqG02mlaOwHhYYxhnzP4EIKzuPWMwpa8xfrp5ma8fQn ZmtLUHTCODq9x0GM/6p048m3yrXav97QJvSpqIuyGRUbXLW88FSmvImmdDq6nTe/y8/t zd45Y4UGA3R8Lyt8fdEcwOGKzp8JxeES/za8Hy7QvYpqyPz2lx8EauaA09gebCwXtJZ3 EU5onvSP5lMYGBrI21yDnoXAvrHpuwH3/QIMYLj8gFFlQBWb3/PS0DhLyMROjX+70DZc JeEA== X-Gm-Message-State: AOAM532RsHkret2bxVHSJeNc49wxklHNZAsL0EFuANdAiN1rlz4z+IVl EPONluLFHownkuFLhXZe7gQ= X-Google-Smtp-Source: ABdhPJy1MOvO1jejgEGSqlT+tqSgZj60UNlF3SD4n/lv295flmVB+qnElWDlJV05i3riqUPEoxG59A== X-Received: by 2002:a05:6402:31b1:: with SMTP id dj17mr19307144edb.142.1590490062733; Tue, 26 May 2020 03:47:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 10/14] hw/mips/fuloong2e: Fix typo in Fuloong machine name Date: Tue, 26 May 2020 12:47:22 +0200 Message-Id: <20200526104726.11273-11-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) We always miswrote the Fuloong machine... Fix its name. Add an machine alias to the previous name for backward compatibility. Suggested-by: Aleksandar Markovic Message-id: <20200510210128.18343-5-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Aleksandar Markovic --- docs/system/deprecated.rst | 5 +++ docs/system/target-mips.rst | 2 +- default-configs/mips64el-softmmu.mak | 2 +- hw/isa/vt82c686.c | 2 +- hw/mips/{mips_fulong2e.c =3D> fuloong2e.c} | 41 ++++++++++++------------ hw/pci-host/bonito.c | 8 ++--- tests/qtest/endianness-test.c | 2 +- MAINTAINERS | 4 +-- hw/mips/Kconfig | 2 +- hw/mips/Makefile.objs | 2 +- 10 files changed, 38 insertions(+), 32 deletions(-) rename hw/mips/{mips_fulong2e.c =3D> fuloong2e.c} (91%) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 3142fac386..f0061f94aa 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -368,6 +368,11 @@ mips ``r4k`` platform (since 5.0) This machine type is very old and unmaintained. Users should use the ``mal= ta`` machine type instead. =20 +mips ``fulong2e`` machine (since 5.1) +''''''''''''''''''''''''''''''''''''' + +This machine has been renamed ``fuloong2e``. + ``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (since 5.0) ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/system/target-mips.rst b/docs/system/target-mips.rst index 2736fd0509..cd2a931edf 100644 --- a/docs/system/target-mips.rst +++ b/docs/system/target-mips.rst @@ -74,7 +74,7 @@ The MIPS Magnum R4000 emulation supports: =20 - G364 framebuffer =20 -The Fulong 2E emulation supports: +The Fuloong 2E emulation supports: =20 - Loongson 2E CPU =20 diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index 8b0c9b1e15..9f8a3ef156 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -2,7 +2,7 @@ =20 include mips-softmmu-common.mak CONFIG_IDE_VIA=3Dy -CONFIG_FULONG=3Dy +CONFIG_FULOONG=3Dy CONFIG_ATI_VGA=3Dy CONFIG_RTL8139_PCI=3Dy CONFIG_JAZZ=3Dy diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index d9b51fce8d..fac4e56b7d 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -503,7 +503,7 @@ static void via_class_init(ObjectClass *klass, void *da= ta) dc->vmsd =3D &vmstate_via; /* * Reason: part of VIA VT82C686 southbridge, needs to be wired up, - * e.g. by mips_fulong2e_init() + * e.g. by mips_fuloong2e_init() */ dc->user_creatable =3D false; } diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/fuloong2e.c similarity index 91% rename from hw/mips/mips_fulong2e.c rename to hw/mips/fuloong2e.c index 6996f5e3d1..f583c44b79 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/fuloong2e.c @@ -1,5 +1,5 @@ /* - * QEMU fulong 2e mini pc support + * QEMU fuloong 2e mini pc support * * Copyright (c) 2008 yajin (yajin@vm-kernel.org) * Copyright (c) 2009 chenming (chenming@rdc.faw.com.cn) @@ -11,8 +11,8 @@ */ =20 /* - * Fulong 2e mini pc is based on ICT/ST Loongson 2e CPU (MIPS III like, 80= 0MHz) - * http://www.linux-mips.org/wiki/Fulong + * Fuloong 2e mini pc is based on ICT/ST Loongson 2e CPU (MIPS III like, 8= 00MHz) + * https://www.linux-mips.org/wiki/Fuloong_2E * * Loongson 2e user manual: * http://www.loongsondeveloper.com/doc/Loongson2EUserGuide.pdf @@ -45,13 +45,13 @@ #include "sysemu/reset.h" #include "qemu/error-report.h" =20 -#define DEBUG_FULONG2E_INIT +#define DEBUG_FULOONG2E_INIT =20 #define ENVP_ADDR 0x80002000l #define ENVP_NB_ENTRIES 16 #define ENVP_ENTRY_SIZE 256 =20 -/* fulong 2e has a 512k flash: Winbond W39L040AP70Z */ +/* Fuloong 2e has a 512k flash: Winbond W39L040AP70Z */ #define BIOS_SIZE (512 * KiB) #define MAX_IDE_BUS 2 =20 @@ -68,12 +68,12 @@ * 2, use "Bonito2edev" to replace "dir_corresponding_to_your_target_hardw= are" * in the "Compile Guide". */ -#define FULONG_BIOSNAME "pmon_fulong2e.bin" +#define FULOONG_BIOSNAME "pmon_2e.bin" =20 -/* PCI SLOT in fulong 2e */ -#define FULONG2E_VIA_SLOT 5 -#define FULONG2E_ATI_SLOT 6 -#define FULONG2E_RTL8139_SLOT 7 +/* PCI SLOT in Fuloong 2e */ +#define FULOONG2E_VIA_SLOT 5 +#define FULOONG2E_ATI_SLOT 6 +#define FULOONG2E_RTL8139_SLOT 7 =20 static struct _loaderparams { int ram_size; @@ -278,7 +278,7 @@ static void network_init(PCIBus *pci_bus) const char *default_devaddr =3D NULL; =20 if (i =3D=3D 0 && (!nd->model || strcmp(nd->model, "rtl8139") =3D= =3D 0)) { - /* The fulong board has a RTL8139 card using PCI SLOT 7 */ + /* The Fuloong board has a RTL8139 card using PCI SLOT 7 */ default_devaddr =3D "07"; } =20 @@ -286,7 +286,7 @@ static void network_init(PCIBus *pci_bus) } } =20 -static void mips_fulong2e_init(MachineState *machine) +static void mips_fuloong2e_init(MachineState *machine) { const char *kernel_filename =3D machine->kernel_filename; const char *kernel_cmdline =3D machine->kernel_cmdline; @@ -318,7 +318,7 @@ static void mips_fulong2e_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0, machine->ram); =20 /* Boot ROM */ - memory_region_init_rom(bios, NULL, "fulong2e.bios", BIOS_SIZE, + memory_region_init_rom(bios, NULL, "fuloong2e.bios", BIOS_SIZE, &error_fatal); memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); =20 @@ -336,7 +336,7 @@ static void mips_fulong2e_init(MachineState *machine) write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entr= y); } else { if (bios_name =3D=3D NULL) { - bios_name =3D FULONG_BIOSNAME; + bios_name =3D FULOONG_BIOSNAME; } filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (filename) { @@ -362,7 +362,7 @@ static void mips_fulong2e_init(MachineState *machine) pci_bus =3D bonito_init((qemu_irq *)&(env->irq[2])); =20 /* South bridge -> IP5 */ - vt82c686b_southbridge_init(pci_bus, FULONG2E_VIA_SLOT, env->irq[5], + vt82c686b_southbridge_init(pci_bus, FULOONG2E_VIA_SLOT, env->irq[5], &smbus, &isa_bus); =20 /* GPU */ @@ -383,14 +383,15 @@ static void mips_fulong2e_init(MachineState *machine) network_init(pci_bus); } =20 -static void mips_fulong2e_machine_init(MachineClass *mc) +static void mips_fuloong2e_machine_init(MachineClass *mc) { - mc->desc =3D "Fulong 2e mini pc"; - mc->init =3D mips_fulong2e_init; + mc->desc =3D "Fuloong 2e mini pc"; + mc->alias =3D "fulong2e"; /* Incorrect name used up to QEM= U 4.2 */ + mc->init =3D mips_fuloong2e_init; mc->block_default_type =3D IF_IDE; mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("Loongson-2E"); mc->default_ram_size =3D 256 * MiB; - mc->default_ram_id =3D "fulong2e.ram"; + mc->default_ram_id =3D "fuloong2e.ram"; } =20 -DEFINE_MACHINE("fulong2e", mips_fulong2e_machine_init) +DEFINE_MACHINE("fuloong2e", mips_fuloong2e_machine_init) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index d0201ce59e..f9697dcc43 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -11,7 +11,7 @@ */ =20 /* - * fulong 2e mini pc has a bonito north bridge. + * fuloong 2e mini pc has a bonito north bridge. */ =20 /* @@ -573,11 +573,11 @@ static int pci_bonito_map_irq(PCIDevice *pci_dev, int= irq_num) slot =3D (pci_dev->devfn >> 3); =20 switch (slot) { - case 5: /* FULONG2E_VIA_SLOT, SouthBridge, IDE, USB, ACPI, AC97, MC9= 7 */ + case 5: /* FULOONG2E_VIA_SLOT, SouthBridge, IDE, USB, ACPI, AC97, MC= 97 */ return irq_num % 4 + BONITO_IRQ_BASE; - case 6: /* FULONG2E_ATI_SLOT, VGA */ + case 6: /* FULOONG2E_ATI_SLOT, VGA */ return 4 + BONITO_IRQ_BASE; - case 7: /* FULONG2E_RTL_SLOT, RTL8139 */ + case 7: /* FULOONG2E_RTL_SLOT, RTL8139 */ return 5 + BONITO_IRQ_BASE; case 8 ... 12: /* PCI slot 1 to 4 */ return (slot - 8 + irq_num) + 6 + BONITO_IRQ_BASE; diff --git a/tests/qtest/endianness-test.c b/tests/qtest/endianness-test.c index 2798802c63..cc088ac01a 100644 --- a/tests/qtest/endianness-test.c +++ b/tests/qtest/endianness-test.c @@ -33,7 +33,7 @@ static const TestCase test_cases[] =3D { { "mips64", "pica61", 0x90000000, .bswap =3D true }, { "mips64", "mips", 0x14000000, .bswap =3D true }, { "mips64", "malta", 0x10000000, .bswap =3D true }, - { "mips64el", "fulong2e", 0x1fd00000 }, + { "mips64el", "fuloong2e", 0x1fd00000 }, { "ppc", "g3beige", 0xfe000000, .bswap =3D true, .superio =3D "i82378"= }, { "ppc", "40p", 0x80000000, .bswap =3D true }, { "ppc", "bamboo", 0xe8000000, .bswap =3D true, .superio =3D "i82378" = }, diff --git a/MAINTAINERS b/MAINTAINERS index 8f597aae12..8136a0e56c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1081,13 +1081,13 @@ R: Aleksandar Rikalo S: Obsolete F: hw/mips/mips_r4k.c =20 -Fulong 2E +Fuloong 2E M: Huacai Chen M: Philippe Mathieu-Daud=C3=A9 M: Aleksandar Markovic R: Jiaxun Yang S: Odd Fixes -F: hw/mips/mips_fulong2e.c +F: hw/mips/fuloong2e.c F: hw/isa/vt82c686.c F: hw/pci-host/bonito.c F: include/hw/isa/vt82c686.h diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 2240504dff..67d39c56a4 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -41,7 +41,7 @@ config JAZZ select DS1225Y select JAZZ_LED =20 -config FULONG +config FULOONG bool select PCI_BONITO =20 diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 525809af07..8ab41edc3f 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -3,6 +3,6 @@ obj-$(CONFIG_R4K) +=3D mips_r4k.o obj-$(CONFIG_MALTA) +=3D gt64xxx_pci.o mips_malta.o obj-$(CONFIG_MIPSSIM) +=3D mips_mipssim.o obj-$(CONFIG_JAZZ) +=3D mips_jazz.o -obj-$(CONFIG_FULONG) +=3D mips_fulong2e.o +obj-$(CONFIG_FULOONG) +=3D fuloong2e.o obj-$(CONFIG_MIPS_CPS) +=3D cps.o obj-$(CONFIG_MIPS_BOSTON) +=3D boston.o --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590490089; cv=none; d=zohomail.com; s=zohoarc; b=R5CoUjkK/cfCPr6gwBBSpMbg8mtamwAHjSlCy6pDnDIoLyOCXLPtNgkta36KnXh6E/nmjd5xuxk2QFxDpIbAPZqPh4E1Su5jLoUyBjbyQ+TMaS20EzQLZVjLi+7smjw7Ux0O12rxqTH/D2hM0vaUUt3371ARg5ZNQzhF7q/6ewQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490089; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CA4dl2WNChH9j4MQdjSr57dN4nPG4AfEzYEDKDaDKgY=; b=YF187S+NvnUsjgW6wzYa0Hp2XXcQPG8q0lq1tUnoo36l81d7CkjGTlIpnzSoON1Yk8LhQUQ9EL51vOAMLLa/DeUonkk/46mZx3XnvND1VqYoqBD+6GCpGvsLC3wMureVDsZE7YhkOCRGWh8rNyrNYObb0m2qHqyyv3d+tScgAB8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 159049008943599.90034715559682; Tue, 26 May 2020 03:48:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-bCQtuQVyOZC7fmXN2g_ncw-1; Tue, 26 May 2020 06:48:05 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C34B100CC85; Tue, 26 May 2020 10:48:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F7436EDAA; Tue, 26 May 2020 10:48:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0CF4A6B4A5; Tue, 26 May 2020 10:48:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAlnhx029904 for ; Tue, 26 May 2020 06:47:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id E01C25AB87; Tue, 26 May 2020 10:47:49 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC4C55AB70 for ; Tue, 26 May 2020 10:47:49 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C41F88F8406 for ; Tue, 26 May 2020 10:47:49 +0000 (UTC) Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-76-4uEDCvEnOESgLT-nRxhicQ-1; Tue, 26 May 2020 06:47:46 -0400 Received: by mail-ed1-f50.google.com with SMTP id g9so17216179edr.8; Tue, 26 May 2020 03:47:45 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490088; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CA4dl2WNChH9j4MQdjSr57dN4nPG4AfEzYEDKDaDKgY=; b=iwBNiGidrZXxDVi496cnOlqjotZoW6eaQZhHPjqSZA3n66vgMk6oa0vFmxgHpUsz7seBmT A7FwZyQ7bxqvUTKUYISCa9tR38qHktEYJ5zvVDjBPVuyByO4nf3tKShrbcvBWklMOT3CrL c4il8OHGj7kp2TdW46/0/n/49+roukU= X-MC-Unique: bCQtuQVyOZC7fmXN2g_ncw-1 X-MC-Unique: 4uEDCvEnOESgLT-nRxhicQ-1 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=CA4dl2WNChH9j4MQdjSr57dN4nPG4AfEzYEDKDaDKgY=; b=ujDp5dCUegU9A3HmhFZkUjQQXaUM9xk8DqsD0W8eqnKpe1Sr79vdjsxqevwPpCv/cV X6b7UYkcRI5N/H/6nod5v60x+n0ORFcf1/RPNO1ZtPpQLlWqzZ7d4DaK63P0ITUrApYT hcRPJFQMSWQpD+q5aTZ8SByy2XtJ0bAMu2oMUmVIX6cg3Le2UGv1ZdlELALVMwjNGYue QAb5M+dR2Ij+Q181uEnZm6CofE7JQem0QWOL97o6dsp3ojFQiDA3JZ1i/Hfdi5Ui5DnK sHqzlCW27lQXVjMWS7duOlZVjleh4HZx09Db1EvCpHTH9pGbEDYX6GWmfgUVi9lmd5io 9AHw== X-Gm-Message-State: AOAM531sMOjobL6kb9Jgw7EzoOa5tMJkBdwNhSCz3MBBV2xya8TRltue VkRralpAQwst1pyaGXLIawU= X-Google-Smtp-Source: ABdhPJwnxMuZ0W4ADcfuIOCKATeEMRyPV62TWp9vH1xXJ2pTzpB2JmpMMtINunhzUEgjZBnsyQvWWQ== X-Received: by 2002:a50:eb0c:: with SMTP id y12mr18730066edp.165.1590490064069; Tue, 26 May 2020 03:47:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 11/14] hw/mips: Rename malta/mipssim/r4k/jazz files Date: Tue, 26 May 2020 12:47:23 +0200 Message-Id: <20200526104726.11273-12-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Aleksandar Markovic Machine file names should not have prefix "mips_". Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Aleksandar Markovic Message-id: <20200518200920.17344-22-aleksandar.qemu.devel@gmail.com> [PMD: Fixed Fuloong line conflict due to rebase] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/{mips_jazz.c =3D> jazz.c} | 0 hw/mips/{mips_malta.c =3D> malta.c} | 0 hw/mips/{mips_mipssim.c =3D> mipssim.c} | 0 hw/mips/{mips_r4k.c =3D> r4k.c} | 0 MAINTAINERS | 8 ++++---- hw/mips/Makefile.objs | 8 ++++---- 6 files changed, 8 insertions(+), 8 deletions(-) rename hw/mips/{mips_jazz.c =3D> jazz.c} (100%) rename hw/mips/{mips_malta.c =3D> malta.c} (100%) rename hw/mips/{mips_mipssim.c =3D> mipssim.c} (100%) rename hw/mips/{mips_r4k.c =3D> r4k.c} (100%) diff --git a/hw/mips/mips_jazz.c b/hw/mips/jazz.c similarity index 100% rename from hw/mips/mips_jazz.c rename to hw/mips/jazz.c diff --git a/hw/mips/mips_malta.c b/hw/mips/malta.c similarity index 100% rename from hw/mips/mips_malta.c rename to hw/mips/malta.c diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mipssim.c similarity index 100% rename from hw/mips/mips_mipssim.c rename to hw/mips/mipssim.c diff --git a/hw/mips/mips_r4k.c b/hw/mips/r4k.c similarity index 100% rename from hw/mips/mips_r4k.c rename to hw/mips/r4k.c diff --git a/MAINTAINERS b/MAINTAINERS index 8136a0e56c..f46ab150dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1050,7 +1050,7 @@ Jazz M: Herv=C3=A9 Poussineau R: Aleksandar Rikalo S: Maintained -F: hw/mips/mips_jazz.c +F: hw/mips/jazz.c F: hw/display/jazz_led.c F: hw/dma/rc4030.c =20 @@ -1061,7 +1061,7 @@ R: Aurelien Jarno S: Maintained F: hw/isa/piix4.c F: hw/acpi/piix4.c -F: hw/mips/mips_malta.c +F: hw/mips/malta.c F: hw/mips/gt64xxx_pci.c F: include/hw/southbridge/piix.h F: tests/acceptance/linux_ssh_mips_malta.py @@ -1071,7 +1071,7 @@ Mipssim M: Aleksandar Markovic R: Aleksandar Rikalo S: Odd Fixes -F: hw/mips/mips_mipssim.c +F: hw/mips/mipssim.c F: hw/net/mipsnet.c =20 R4000 @@ -1079,7 +1079,7 @@ M: Aleksandar Markovic R: Aurelien Jarno R: Aleksandar Rikalo S: Obsolete -F: hw/mips/mips_r4k.c +F: hw/mips/r4k.c =20 Fuloong 2E M: Huacai Chen diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 8ab41edc3f..739e2b7b40 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,8 +1,8 @@ obj-y +=3D addr.o mips_int.o -obj-$(CONFIG_R4K) +=3D mips_r4k.o -obj-$(CONFIG_MALTA) +=3D gt64xxx_pci.o mips_malta.o -obj-$(CONFIG_MIPSSIM) +=3D mips_mipssim.o -obj-$(CONFIG_JAZZ) +=3D mips_jazz.o +obj-$(CONFIG_R4K) +=3D r4k.o +obj-$(CONFIG_MALTA) +=3D gt64xxx_pci.o malta.o +obj-$(CONFIG_MIPSSIM) +=3D mipssim.o +obj-$(CONFIG_JAZZ) +=3D jazz.o obj-$(CONFIG_FULOONG) +=3D fuloong2e.o obj-$(CONFIG_MIPS_CPS) +=3D cps.o obj-$(CONFIG_MIPS_BOSTON) +=3D boston.o --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590490090; cv=none; d=zohomail.com; s=zohoarc; b=bp1Ecs4BKdOxAM3Pl2zQ3HzgWynifDGH1GEYWF+tMyn9c5D5q04gg6cvfvhsaxh+1742k6OKUte9Hzf/LaS9BrNfVVVxz8HS16a+bfe0syajVvYvxt//D4gpqE4ruG4Nq9VoqvDg6tbV4gJD9t6fQENcDZ5jy0Yn35FsAyW5EyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490090; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=45UgqB7xiuv75to9D1xtOkBXTGrFM8LHRPwW44N+AXY=; b=e6lg7fXZmtZ0TbnDL8Oboe7KTMcOZ4qLad4IWUWXif+TP50CaoQTT4u9U8og8VydEGViKbWcmTzKCoBsUBFJZNWAVunquHcbo+yA62jQbGpkO09nUGeLzfUXTbaALwBoqyNK+QRSSrkA5RzCmGEEfURxuNyXvc5hz7psaSOGck4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1590490090074755.968176306106; Tue, 26 May 2020 03:48:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-228-dHojzychMp2VYaa0jowmbQ-1; Tue, 26 May 2020 06:48:06 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 204E4100CC8A; Tue, 26 May 2020 10:48:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F122110013D2; Tue, 26 May 2020 10:48:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C1A2E6B4D5; Tue, 26 May 2020 10:48:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAlvQu030016 for ; Tue, 26 May 2020 06:47:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 971C15EDC1; Tue, 26 May 2020 10:47:56 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E5D45AB92 for ; Tue, 26 May 2020 10:47:54 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DB8608F7A3E for ; Tue, 26 May 2020 10:47:52 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-13-8cLnzijjPoiRl1cTKpn2Lw-1; Tue, 26 May 2020 06:47:47 -0400 Received: by mail-ed1-f67.google.com with SMTP id e10so17247978edq.0; Tue, 26 May 2020 03:47:46 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490088; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=45UgqB7xiuv75to9D1xtOkBXTGrFM8LHRPwW44N+AXY=; b=dFG/QV4TnHxa5eJjKrtsfVPasbCMOke3nyADwO/o8sRnloas+ZHQwVT++434dMSP+ZIjfD dvdFlwrMuTyY4RiaZWIZPg+7jMUq21L55XVMnph6bA43kt51MFJo0JtqStEYZwcASK6Uoa t7O3Aa0SsZMUh+fxk13LbKhW44S0/gQ= X-MC-Unique: dHojzychMp2VYaa0jowmbQ-1 X-MC-Unique: 8cLnzijjPoiRl1cTKpn2Lw-1 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=45UgqB7xiuv75to9D1xtOkBXTGrFM8LHRPwW44N+AXY=; b=QhG4LKuW7QqaVqzO1OnV9BbLe5CKf/NpOc7WO/b2P9Xipk1zizfSxKgQTor84oUCHg BlvKgb2z26PDBwGcioKRgHLu6phj4KghI9wJzTWls4fTdxwUu8II6RmPMZ7TQqp1fL4i mIVdJH+k3HAOX0Kgb2sxcLa9ujUR46D3kUSRNOs8pCv1ooPmSYwNWAffxt70gEPh1jD6 dY3IWdeoehtCFqb69lMSacdFaCS7jyEjOujxgpcY5YWM7tiH+G8ntIHv4iW9o5WE8Fs+ PVB/FtMcENaf1VqRFTzuUOroNrU+ON+s2iHcwLCjPVWdZ4FFn0rHTw1I32YJ6/Onm9Jc 04ZA== X-Gm-Message-State: AOAM5314zW9fKFmFO4cj8t+fNhbh6ECSNThX4txp3iTwra7QeR/CJJ4p EYqtTkyTJpD974Gxv9PNhno= X-Google-Smtp-Source: ABdhPJz2BuRcHYEb0vJvbDghC8GF7FUB+ZLTYw4hWm0S4PsoeKn/UWCsOYNfxvHRzf7lUPCp+rcP7g== X-Received: by 2002:a50:8e56:: with SMTP id 22mr18385165edx.268.1590490066045; Tue, 26 May 2020 03:47:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 12/14] hw/mips/malta: Add some logging for bad register offset cases Date: Tue, 26 May 2020 12:47:24 +0200 Message-Id: <20200526104726.11273-13-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Aleksandar Markovic Log the cases where a guest attempts read or write using bad register offset. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Aleksandar Markovic Message-id: <20200518200920.17344-21-aleksandar.qemu.devel@gmail.com> [PMD: Replaced TARGET_FMT_lx by HWADDR_PRIX] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index e4c4de1b4e..b673a3a248 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -427,10 +427,9 @@ static uint64_t malta_fpga_read(void *opaque, hwaddr a= ddr, break; =20 default: -#if 0 - printf("malta_fpga_read: Bad register offset 0x" TARGET_FMT_lx "\n= ", - addr); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "malta_fpga_read: Bad register addr 0x%"HWADDR_PRIX"= \n", + addr); break; } return val; @@ -515,10 +514,9 @@ static void malta_fpga_write(void *opaque, hwaddr addr, break; =20 default: -#if 0 - printf("malta_fpga_write: Bad register offset 0x" TARGET_FMT_lx "\= n", - addr); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "malta_fpga_write: Bad register addr 0x%"HWADDR_PRIX= "\n", + addr); break; } } --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1590490088; cv=none; d=zohomail.com; s=zohoarc; b=Q75sahuKXP/bQsN7Hpyfj8g/ViWUQfZjUO5FUE5zhRa7vl46QCz4bOHrSapUWpcrh171COheZz9NNWSwdAuSv1BvEg9c8FTqtik0hig0oMCt2xay4fhzh6jFDKRYQkSIcpFubcSW43rY5QMl6vbTzH+PFvJtysICk9wozUAhHdc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SzMnP+v0boOKzPS/hAbB4oxH7IK6D4Ae63ekoZyVIXc=; b=a9SysdSsKGxJrK/73xeVGFTccxqpkDfnjIuSZKtsRJqMKOXz5XulKr0atXj4hVjBi3muGEfjhu+466jtdPX/rKBV8r2AbXSKO289lXqDfvXjFKjqdN8OE+iWe4ohd//4f2aIA/Hkw3tORPknc9FAoXROAswBsZ+GLdliNmVbECk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1590490088144351.7635432255523; Tue, 26 May 2020 03:48:08 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-485-JbkpiV00PEqcOZ7sYZWCfQ-1; Tue, 26 May 2020 06:48:04 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5462D107ACF9; Tue, 26 May 2020 10:47:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3598D79C4C; Tue, 26 May 2020 10:47:59 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 093226B498; Tue, 26 May 2020 10:47:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAluK4030004 for ; Tue, 26 May 2020 06:47:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4CDA4202696C; Tue, 26 May 2020 10:47:56 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 254262028CD3 for ; Tue, 26 May 2020 10:47:56 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2A6A01049847 for ; Tue, 26 May 2020 10:47:54 +0000 (UTC) Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-403-UUYS19MNOx2vgCz0NXAhxw-1; Tue, 26 May 2020 06:47:49 -0400 Received: by mail-ej1-f66.google.com with SMTP id o15so1910511ejm.12; Tue, 26 May 2020 03:47:48 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490086; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SzMnP+v0boOKzPS/hAbB4oxH7IK6D4Ae63ekoZyVIXc=; b=Aj3m0dkYzl5ghqeK55JnhfTmMDsKXPUaxl87sgE0o/FR/rKlI00qp2dKVPGuZtM5KpXARA TmdGIo0qDFtDC4YKMRyOgYsTzjiKgQ3BfcuyLHW4dr5yDRWx12on1oCzrs0HbTTf7J+CmO 0xMMEPvmoB/q8qbYxXWWB6B1cqVTERI= X-MC-Unique: JbkpiV00PEqcOZ7sYZWCfQ-1 X-MC-Unique: UUYS19MNOx2vgCz0NXAhxw-1 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=SzMnP+v0boOKzPS/hAbB4oxH7IK6D4Ae63ekoZyVIXc=; b=YZVhCR3nHBPkZGvDLseW9rS8k+TODF3OLPQnTDtjofIlTTejIphoPcz9M2AjtMGl+v kl1sAKdGL+vfLw47rBY9D/v79vDBl/nbY2NA490teR96as7nd8PuSB9NzNXVM6pTvRhg gHATz2XJ6xxdIO4QSjBWAMbKOfgX9VRpI58KkFJZ9TDoeVr8qBTxJ34kS/TzXElIvxDn eUH3b75t+FDNYewFwIfAvQJmqOv1N9PCcxtK8+O1OCsugjtgrpX7AAs4Ws8MV31MB9Y/ VqMeqreBwznATdV93sOE9/QnOvZ5kLgxPHSucfWmpo/LPzL5V931bpDwskqcZs55p9qn f2OQ== X-Gm-Message-State: AOAM533sVBMCKTkice1KiGBbECLraM2WSS02f2XJ8Bf0i6kyGUEoDD7n MKUdOL5aeRzU59MUkaowf6c= X-Google-Smtp-Source: ABdhPJy1srfveRWp4BYfglPPpBm74kwqzlVLximCdMgSDXaasUTut93LWwDHx66jJr980f8hMOkJoA== X-Received: by 2002:a17:906:1f09:: with SMTP id w9mr530482ejj.508.1590490067469; Tue, 26 May 2020 03:47:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 13/14] hw/mips/mips_int: De-duplicate KVM interrupt delivery Date: Tue, 26 May 2020 12:47:25 +0200 Message-Id: <20200526104726.11273-14-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Refactor duplicated code in a single place. Reviewed-by: Thomas Huth Message-Id: <20200429082916.10669-2-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/mips_int.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index 796730b11d..4a1bf846da 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -47,17 +47,12 @@ static void cpu_mips_irq_request(void *opaque, int irq,= int level) =20 if (level) { env->CP0_Cause |=3D 1 << (irq + CP0Ca_IP); - - if (kvm_enabled() && irq =3D=3D 2) { - kvm_mips_set_interrupt(cpu, irq, level); - } - } else { env->CP0_Cause &=3D ~(1 << (irq + CP0Ca_IP)); + } =20 - if (kvm_enabled() && irq =3D=3D 2) { - kvm_mips_set_interrupt(cpu, irq, level); - } + if (kvm_enabled() && irq =3D=3D 2) { + kvm_mips_set_interrupt(cpu, irq, level); } =20 if (env->CP0_Cause & CP0Ca_IP_mask) { --=20 2.21.3 From nobody Tue Apr 30 21:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1590490092; cv=none; d=zohomail.com; s=zohoarc; b=aR8qOAN2CZQ7ITUUtdJfyVFu7xnrABr1oZ3oh2lMAJe+vnIAkdQYfSMd7VaMpNIGO2wXI9jUvcqESnZB6G1Z0iGP4kv2jj7eUFYlqfbOErEq6A+O4bg5O33FcX7Bs5dhOsj9PSuSjfgXcKQ+w9cswtYHueIXja63tTybVfOmezQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590490092; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pPV3t0ciHdfu4yziGudCLa1nZMiogySec4g5RazN6FY=; b=EB+qZzOBVBzqO9hULKPXR3segKhsy7EvaE0EuMDfXWAVExEoFGgF+W4HjvE/6enKuWC+fAE5rrX0BDdmsCZ0NqgTn/AXCFh551PX0f0ZcNNqb20YKQOVK5/kzRHiaGReC+/uRgPJNc83HFy9kgZqmlsqUCKVj5iEgMH6r9SVlew= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1590490092703470.0893053976687; Tue, 26 May 2020 03:48:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-500-4svJYwZvNGmrxzPm8DqgEg-1; Tue, 26 May 2020 06:48:08 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74D21100CC8B; Tue, 26 May 2020 10:48:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 521693C70; Tue, 26 May 2020 10:48:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1B8AE1809563; Tue, 26 May 2020 10:48:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04QAlwcv030027 for ; Tue, 26 May 2020 06:47:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3CAD85AB87; Tue, 26 May 2020 10:47:57 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C6145AB95 for ; Tue, 26 May 2020 10:47:54 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1815D80A0B6 for ; Tue, 26 May 2020 10:47:54 +0000 (UTC) Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-38-oFLtrOOtMFaiiLmBTLEb4g-1; Tue, 26 May 2020 06:47:50 -0400 Received: by mail-ej1-f66.google.com with SMTP id n24so23290967ejd.0; Tue, 26 May 2020 03:47:49 -0700 (PDT) Received: from x1w.redhat.com (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id c27sm3342597ejd.19.2020.05.26.03.47.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 03:47:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590490091; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pPV3t0ciHdfu4yziGudCLa1nZMiogySec4g5RazN6FY=; b=EpH50VYyvkgbN9xpYTSHKEwJV4zZjXmm9O42oD4xWG7cmr5/Sa8Jci1NWtvdePSKl2eyCY h3jPdSNz6CM9YDNsOUOn8Wl4Q02jIexCwfR7kXthfXl6nH+WbDY8lHPcY/RefkB1LOUd+2 YihEU9bBm3OJ6pxEAOnrsxcycJuO8P8= X-MC-Unique: 4svJYwZvNGmrxzPm8DqgEg-1 X-MC-Unique: oFLtrOOtMFaiiLmBTLEb4g-1 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=pPV3t0ciHdfu4yziGudCLa1nZMiogySec4g5RazN6FY=; b=lftd+plGy0jisureWvb7+zOcXhTXO3kjF+6Z2Drp+Zvyw9tUWAg+UScHQa4tt2vtlH KMpVxLtbJ0dESZkbnhHL1vN8edDdIp21S88iRNpK3DvTSU0Fm5TDk0yy2fqMECx3M89b 2tZMBFdyUpuu2libxX9/wW3X0nzrW/NyCjOaxUMTsPP8P308UmROOOJVAzGYCHF/IfIg Fq/iZCmS2f+JLStc448uIE/A/4tokcY3e/smmmzdtgVBiptPI7TSMAo5ZB34Bez9hHSj aoQpv2BnjQbL+PJ0Z9xi01ggWoNKcILF5w5Bknrabx92ZYdQ0E1AhoQIrAJLEBmytk+Z Unnw== X-Gm-Message-State: AOAM5303oESACj8H/HI2VRYx4bfdXvNdmO9I9UPnzVHEKwzsEjhWSiTK cBa1l84qWGR2eSrLDAuH2bk= X-Google-Smtp-Source: ABdhPJyOIhYvBjUKnznFH2d8so6ICd+nNEYSs8guprv5YVr7C++zZpO6tigE1IZ47JQzT+009hnsGQ== X-Received: by 2002:a17:906:c785:: with SMTP id cw5mr502946ejb.543.1590490068872; Tue, 26 May 2020 03:47:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 14/14] MAINTAINERS: Change Aleksandar Rikalo's email address Date: Tue, 26 May 2020 12:47:26 +0200 Message-Id: <20200526104726.11273-15-f4bug@amsat.org> In-Reply-To: <20200526104726.11273-1-f4bug@amsat.org> References: <20200526104726.11273-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Spam-Signature: yes X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Aleksandar Rikalo , libvir-list@redhat.com, Thomas Huth , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Huacai Chen , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Aleksandar Markovic Aleksandar Rikalo wants to use a different email address from now on. Reviewed-by: Aleksandar Rikalo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Aleksandar Markovic Message-id: <20200518200920.17344-18-aleksandar.qemu.devel@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .mailmap | 3 ++- MAINTAINERS | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index 6412067bde..e3628c7a66 100644 --- a/.mailmap +++ b/.mailmap @@ -42,7 +42,8 @@ Justin Terry (VM) Justin Terry (V= M) via Qemu-devel Aleksandar Markovic Aleksandar Markovic -Aleksandar Rikalo +Aleksandar Rikalo +Aleksandar Rikalo Anthony Liguori Anthony Liguori James Hogan Leif Lindholm diff --git a/MAINTAINERS b/MAINTAINERS index f46ab150dc..a209b5d8ce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -213,7 +213,7 @@ F: disas/microblaze.c MIPS TCG CPUs M: Aleksandar Markovic R: Aurelien Jarno -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: target/mips/ F: default-configs/*mips* @@ -1048,7 +1048,7 @@ MIPS Machines ------------- Jazz M: Herv=C3=A9 Poussineau -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: hw/mips/jazz.c F: hw/display/jazz_led.c @@ -1069,7 +1069,7 @@ F: tests/acceptance/machine_mips_malta.py =20 Mipssim M: Aleksandar Markovic -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Odd Fixes F: hw/mips/mipssim.c F: hw/net/mipsnet.c @@ -1077,7 +1077,7 @@ F: hw/net/mipsnet.c R4000 M: Aleksandar Markovic R: Aurelien Jarno -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Obsolete F: hw/mips/r4k.c =20 @@ -1094,7 +1094,7 @@ F: include/hw/isa/vt82c686.h =20 Boston M: Paul Burton -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: hw/core/loader-fit.c F: hw/mips/boston.c @@ -2608,7 +2608,7 @@ F: disas/i386.c MIPS TCG target M: Aleksandar Markovic R: Aurelien Jarno -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: tcg/mips/ =20 --=20 2.21.3