From nobody Mon Apr 29 12:15:22 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=1590500001; cv=none; d=zohomail.com; s=zohoarc; b=VeuAQ0ViI0w+ksS7Srxc1jB+w+tuBdEmaXpf0TUGwArXHuIBQuOymd0FKAF7ZQ/BHDOqy0OFADZjsKc0g09bsaHgiHFRoIDQBi0zG3hgSHd6WXsbD0CXJZ6n/s7nQc42N3wa441WzFclbHDmMGRWF2Kn7m8wQDOzyxkvkFMEkbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500001; 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=X5sHAE8M1AFit2hY0P5A8K/hZU0G5vAM63Ez/cW6sjDwzGjg6P6tsZk3IvguxW0V5sAfXKWarkGHvBX0kpz5Yh/K5v+6KAaiH3kDDdtXkWHioWHBXZTY3c0cRraYDVM7Y2RtRc2Ojhl5CkerWucMIpxTDYya1fOZeKnJsbqT5AQ= 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1590500001824375.8417270866963; Tue, 26 May 2020 06:33:21 -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-159-RR9NtpD3OyCzcxxPUOYDFg-1; Tue, 26 May 2020 09:33:17 -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 EBAD1872FEC; Tue, 26 May 2020 13:33:09 +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 CB74A5D9EF; Tue, 26 May 2020 13:33:09 +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 8218865D10; Tue, 26 May 2020 13:33:09 +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 04QDX51f012420 for ; Tue, 26 May 2020 09:33:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id D2E5E2026E1C; Tue, 26 May 2020 13:33:05 +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 C652F2026FFE for ; Tue, 26 May 2020 13:33:02 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 598268007D4 for ; Tue, 26 May 2020 13:33:00 +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-478-BpUCCBw6PrSjIAM0xrLo7A-1; Tue, 26 May 2020 09:32:53 -0400 Received: by mail-ed1-f66.google.com with SMTP id s19so17629581edt.12; Tue, 26 May 2020 06:32:52 -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 n25sm1623084edo.56.2020.05.26.06.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:32:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500000; 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=BKAzCDBJPNpe1tUMn543/Ozj13P0Wdis0ooWyzJA2kKIaeMJqKJ7TquVS124q6n+w6WA3u D5qArdVS2klLv0BaCCSWZQhQV5QqsRf4f0IJPgFOUQAcOZE2k9u3qQvLRZeejnCNvzy+vQ EbWNdMuVB1RGUbyxQ05tTS7aWkag27Q= X-MC-Unique: RR9NtpD3OyCzcxxPUOYDFg-1 X-MC-Unique: BpUCCBw6PrSjIAM0xrLo7A-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=rAZUpRhDTN5PQcRXRWKtdXFqb8olDZQ2O5MeL9YvoS41JOyTv19MK/BG4InwN1xPbU 3h46aKWlgondupPbyn9S85j0zjLdMNEesDUSzR/zK7xF34NDAijdSjQZ2biGCTnThp/s rktaA2L4IvP76fRr7A7uWH4f/Gp5UsrpB9zWW8eWSMy6sQY+l1D4TVfTU+oM3E1C5h4L UOfPvRGqmfLxcvyyhgRC3767T5/hVySmFAr3rpFiB+4L3R9CbZOeVqk2rV+omet8nFwF Eu4tkPoOFaOt7HMxDb2AM9Zx2Xbt8++eZS8/VCBrLEDKjS6rSPgix5iDeNdcNwlfl5XQ lfiQ== X-Gm-Message-State: AOAM531fvHYtBtmFo1lpc0pf8lZ0EMYBOM6/evZ91yVXtMxYgyF/Z2nd 7u6UouSwpm5FsOyOnTloj74= X-Google-Smtp-Source: ABdhPJyjbLV0myk7DLlqAXN27w7a216ak1PbiJYumlcK8bEgaBWw/c6Z5qBXr9G2R/Qk7VoXUgAztA== X-Received: by 2002:aa7:cc0e:: with SMTP id q14mr20888463edt.64.1590499971068; Tue, 26 May 2020 06:32:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 01/14] MAINTAINERS: Add Huacai Chen as fuloong2e co-maintainer Date: Tue, 26 May 2020 15:32:34 +0200 Message-Id: <20200526133247.13066-2-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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.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) 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 Mon Apr 29 12:15:22 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=1590500005; cv=none; d=zohomail.com; s=zohoarc; b=dXvy38jOmoGAfIytENNVEmesyHvLP2/P/I8dgOaZYepqVzPIjpQZaSpRTOfYkTjM4ujAZy9u6Yg9tQFCS12/6HZKebc88H0VdFnKKb+1K7LDv1CSeSO6hoMuu3VW2MPm1Tmwq3Fx6Fz2FrxStL9YxSi8swL2wM4W7/YYEXiqNFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500005; 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=M4uiK0UtDpsM9svBIUp6A0lUF26pKKyrUrharlDHGzeKQbqWoYokU1LiwHLqUPENrOWUUnRpV5vjyAUhNvWPjK1svAagPoED/V47nAHkqIJZWnWOVJasCrRL5cy+ovcgpvNtBN/XWXy9ye5uHYrpslWUa9RMIjkMxS5Iy92+eP4= 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 1590500005967510.1765281175283; Tue, 26 May 2020 06:33:25 -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-121-ByGf6ciFPZW3uVodQ36mcg-1; Tue, 26 May 2020 09:33:19 -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 4AAC8EC1A6; Tue, 26 May 2020 13:33:10 +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 276976E50D; Tue, 26 May 2020 13:33:10 +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 E3F711809543; Tue, 26 May 2020 13:33:09 +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 04QDX38l012392 for ; Tue, 26 May 2020 09:33:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 98D745EDE5; Tue, 26 May 2020 13:33:02 +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 325CF5AB88 for ; Tue, 26 May 2020 13:33:02 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 163B2862F7A for ; Tue, 26 May 2020 13:33:02 +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-166-i8yqrouFNXyYR_c6FHGF4g-1; Tue, 26 May 2020 09:32:54 -0400 Received: by mail-ed1-f68.google.com with SMTP id d24so17617862eds.11; Tue, 26 May 2020 06:32:53 -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 n25sm1623084edo.56.2020.05.26.06.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500004; 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=ZxmLzjQ4bUorljqYuWr6VmTgXnIbg6am868WkyxH1FQ=; b=W80C5dkLlNbHhafQzICgzKDoKITuiw8H2RivrQG6XXBY+4Bxyqos1H2zn7ggYHfm5qUQH1 8ZqMfMnhME+Xi24ELexuio7rRg4LjwSYA3lILqcSaNBThCtGS35/CBcjxr1KzcQQprVrF+ EJV394PL0EPWRWJb3c9K9QODeUFfqFQ= X-MC-Unique: ByGf6ciFPZW3uVodQ36mcg-1 X-MC-Unique: i8yqrouFNXyYR_c6FHGF4g-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=ZxmLzjQ4bUorljqYuWr6VmTgXnIbg6am868WkyxH1FQ=; b=o9uW01bnsXFuwEzSNUbRLp9IZZH69CGcIYaqhOt9aBAyecfkthJXgAA7YC3YkzkAzo 7V2wwKyOj9B9wlDjikHiathSFQSajOW1rXu+oASYUNPo5/dgAaGfgpYmbggFASC7Ot+R Yu999TOBln1b33AjPMGvbT10X7KLKZEND8uu/40fjQNmmGXkIInXM14alXnflkrNwG3V iQwKB2s5Scoa1PK9ScY9V1RH5diHgHqmonyjDNW+A+1ZIo3UvGA9bobdjcq5FfWlRCfk AJA7tcVQPCKOt70qlF9OmiefiSLrf2iTAjqxG+zeTH+UohnNidFzC+K7bk371spStniY 77GA== X-Gm-Message-State: AOAM530RO+PiyrffQuAJlY2YSV7B9Y1PieWs+WDE3pa/00Z+LWYZjqF/ 1unoYE9aFqEx1kfySSO/wcU= X-Google-Smtp-Source: ABdhPJzYHzoRGE1wRVBnVl/SGEjiVqL2TidTtPjmaa+8kLuri9nxRc4LVKVSWfZFp6XS+Xi6mlJdxg== X-Received: by 2002:aa7:c609:: with SMTP id h9mr2594792edq.155.1590499972630; Tue, 26 May 2020 06:32:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 02/14] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge Date: Tue, 26 May 2020 15:32:35 +0200 Message-Id: <20200526133247.13066-3-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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 , 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) 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 Mon Apr 29 12:15:22 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=1590499994; cv=none; d=zohomail.com; s=zohoarc; b=kEaOMTmN4+uMgqn+ZXlMjuNor5AOwQPXpdJY8wUIkg+Ya6QlgDgJsI3falrswRpkZHRnXEGyi8b3aKM0loj/97FaUmSvSAlvZfimccSfBNP12iK4ji1kLaHd18X078EgQ61jqFi1DRWzHOv0X96r2GNQz00wnEvgw+Cpxnvbymg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590499994; 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=cZeebiqfxhCk62kO9FgJ+tB8pkIxbAdmUPUvlZSrts08tfQBVSjTku4ThFDkoGfdzP1ejjuQ34BHvxSpV9e4JbKx3E3P7hWtbZ5+D/n61OETY+U8wmhVWWFb98js6OaHi+nVQma22/9QJFxXhdvkdTtLIX3f4WNmcJSfLPud+vs= 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 1590499994721206.84428249991947; Tue, 26 May 2020 06:33:14 -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-18-kPyVDqG2PLWHVx72ONcYEw-1; Tue, 26 May 2020 09:33:10 -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 799FD100CCC0; Tue, 26 May 2020 13:33:05 +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 5BC966FB86; Tue, 26 May 2020 13:33: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 2C78862D04; Tue, 26 May 2020 13:33:05 +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 04QDX3SM012397 for ; Tue, 26 May 2020 09:33:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4B91010F26FF; Tue, 26 May 2020 13:33:03 +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 1078D1004C44 for ; Tue, 26 May 2020 13:33:00 +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 B2CEF80028C for ; Tue, 26 May 2020 13:33:00 +0000 (UTC) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-287-QINO9FSZNVO90RRN7opgxA-1; Tue, 26 May 2020 09:32:55 -0400 Received: by mail-ed1-f41.google.com with SMTP id k19so17664347edv.9; Tue, 26 May 2020 06:32:54 -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 n25sm1623084edo.56.2020.05.26.06.32.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590499993; 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=cp7maSiznzg20472qLTFYiR7okUtTqspEiCmqW5Y9/FWsQO5MQ7OmYr9pnRkfJG+naEkwr f4elVQdPbg6p4GKTtdrV57LuUuieErBbaWOs+7B4TqIyJCIbIGX7jmj8qaqsYH0wHMl9I3 CQOSLtacyOE9Eno48CBcvnN5GSjbH4E= X-MC-Unique: kPyVDqG2PLWHVx72ONcYEw-1 X-MC-Unique: QINO9FSZNVO90RRN7opgxA-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=lxlQtJF/ktUEZ047g7jRhonM8pwB/3SN4m0CfJ73m4vbXyJySfl8ouMBO81ex68GzJ lbE/NnsK/u7yytqSAKcWswHkPsxA0vJUYnGj6IzTVoXF28JZyeyu041N0lUNDBvpa/2o do7U0CTQuhObkP6yqUNP6dWu5Ly0/eY0uL74TI3HJFeyLeDWorij+CVR7Z1Fb+Rk/bOZ BB5VkMAfDHFO1FXNdqkKFg02Blnk3kzhNFsVO3FAN+mi2d4ASzKDig+dhRZ/+5hGOLVC k4NWihr/jMXUpKZoBHJLU8HI+wEdt84kJxedD1Kk37+DJsMxNKMh5/olPzXyyRd1URSo /o6w== X-Gm-Message-State: AOAM532ojYt+oiHjamyeiSX/xU2kp3IAmcL+sk1yxEIWgryWu6dTbrss wqoBbsGVk3HQXlaSH8dI3OM= X-Google-Smtp-Source: ABdhPJzlU0PKXICjatTn4uD6jpLoOSgvHPjzWWlceZm8/iHTSrsNzMzNa/Ad9XKj7ed9QUV48aI65Q== X-Received: by 2002:a05:6402:22d9:: with SMTP id dm25mr20402790edb.380.1590499974015; Tue, 26 May 2020 06:32:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 03/14] hw/pci-host/bonito: Fix DPRINTF() format strings Date: Tue, 26 May 2020 15:32:36 +0200 Message-Id: <20200526133247.13066-4-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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.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) 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 Mon Apr 29 12:15:22 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=1590499998; cv=none; d=zohomail.com; s=zohoarc; b=EVEmb85SKYNkkjx5Azm2a5akuazAq1JBI/tzDybgTixVNOc7GWCcxUjaAbSxsnSd9cYsFinPWcSwFsMAiBDnOfEFZJ+5Ii5B9Up4dUYogM4K7nRY1pmGqWGB1NloyKl+1TodgryGM8pBewT/UXTFh/B7Ft7JkA75u9+PBNPULaw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590499998; 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=VSFcwT6vg70122qEIwzoJ6Hd1EJfHvLASO6S6ygESomE4y+MCUSoWY7677R9/rCEJksdnAVK4ZCNacq8Wom6pG7oCj2KoxemZxeLeyTGvY7YkIuLL9Py1eeU1dhOpV2JyWljXXFzWDPeAu93u06l4lxADq633fJYv/lIa0R7xAg= 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 1590499998088391.9194234729508; Tue, 26 May 2020 06:33:18 -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-467-29oXkySCOquFJELZSSMuLg-1; Tue, 26 May 2020 09:33:14 -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 C2133100CCC3; Tue, 26 May 2020 13:33:06 +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 A249D707C6; Tue, 26 May 2020 13:33:06 +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 71B381809554; Tue, 26 May 2020 13:33:06 +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 04QDX3Mf012398 for ; Tue, 26 May 2020 09:33:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 547A15EDEA; Tue, 26 May 2020 13:33:03 +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 2617D5EDDB for ; Tue, 26 May 2020 13:33:02 +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 C4E54180122F for ; Tue, 26 May 2020 13:33:02 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-288-ID4XBhg9NvCOkhIXrM1o1g-1; Tue, 26 May 2020 09:32:57 -0400 Received: by mail-ed1-f51.google.com with SMTP id g9so17643582edw.10; Tue, 26 May 2020 06:32:56 -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 n25sm1623084edo.56.2020.05.26.06.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590499996; 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=Do7wlhGls04ymIAg79wfFJe6G+vxmtdNSUwv24AsBHp886Ay+4GME8NqKPoaF5/r/iNWY2 ScLJEhr92W5FHFa/7MNGTiN8yXph3V2vvkN7x+SuvjNLLsVouYfxuPt7HUIF2AAA6HkSZf NqeapiHzzVnu2qOGvMvKWwBOJalN+qo= X-MC-Unique: 29oXkySCOquFJELZSSMuLg-1 X-MC-Unique: ID4XBhg9NvCOkhIXrM1o1g-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=i/2ofcOwlnKv3YQP0s60XKcfnx95ayQOIJ3TQkQUOrY2sgUj+WOpmyZlFaCFr0pJBz oWg9VKVN8U3QvFXeEeO+VLTcPme3Nw+pyew8BFSANbgrmK2/p/ap4BweQWbutPUytqNP mgv/Necl3kg4pIzP3If790u6P6gEAnzYeJ90AAo8iApowt2UWkAMwznzHteKNWwmQdw2 DWszWaXSJEf+/3cV3Zk6jOAU7xWTJKDpgrz2VF08Z6JKL5QI8VLXPZnOUC/j2dCc6nKC ABUOVAobUR6UPHziWweBncgDsRcJBvxCTZdwVtFp1d2hk9SylzppyXxnHfbrZD1uBOU/ KfWw== X-Gm-Message-State: AOAM531sZYNU3UnLtNaqQcB0/ZPCPIeIaHwlGXShDpxuIKYYScmA0Rhn zAZYT3JkuHNgYPwFcuYfgUk= X-Google-Smtp-Source: ABdhPJzh5e2NJGorrQJUH5eWtCdS6ap4rrW8N0+JXwmSTQz4ZyMcEgH1vsP+EBW4EoanR6T4h6cucQ== X-Received: by 2002:aa7:ca49:: with SMTP id j9mr20535964edt.186.1590499975531; Tue, 26 May 2020 06:32:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 04/14] hw/pci-host/bonito: Map peripheral using physical address Date: Tue, 26 May 2020 15:32:37 +0200 Message-Id: <20200526133247.13066-5-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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.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) 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 Mon Apr 29 12:15:22 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=1590500008; cv=none; d=zohomail.com; s=zohoarc; b=Qv4tAykgLLO80Y4+Wgpuy7xYsXJ6c0kcUQUn5LvAzblXc4h8nQPgnosjBOFp6zyuKkD8lNIbylJbFBz25b9+6+vgM1u6bLzJRGAL7MXHJ3IZyZIJKhBOCiosPfn45pp6sW/VudFOzR5i5bTIdbxfqLiNM0SVoN+stP3mcGBrruc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500008; 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=TwOxYp8FQDWis7w9YoVVh3z7kI42lX8NMObzhY3lP9Gq6WXCqueg4kFFPAN5LkooxDzmboP1vI8tOIm7yEpez+x5KKpFb8oPP9QHR4VHvu2FNy7C4n8gDLkXC5Vlh6fd2xV+FDM/8mQVh/Asp6nuOQbZjp7zZnHMYk+tSzkq6iA= 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 1590500008961505.1175975579006; Tue, 26 May 2020 06:33:28 -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-432-xPXJQgORPVumDLkyb0aXSQ-1; Tue, 26 May 2020 09:33:22 -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 9AB9787308E; Tue, 26 May 2020 13:33:14 +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 7A7C0703A1; Tue, 26 May 2020 13:33:14 +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 478111806B0A; Tue, 26 May 2020 13:33:14 +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 04QDXBE5012469 for ; Tue, 26 May 2020 09:33:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9F7322156A50; Tue, 26 May 2020 13:33:11 +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 81A5D2156A3B for ; Tue, 26 May 2020 13:33:09 +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 0109C8F7A0C for ; Tue, 26 May 2020 13:33:08 +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-284-7TSSnMzeOLKygmK-TgXDfg-1; Tue, 26 May 2020 09:32:59 -0400 Received: by mail-ed1-f65.google.com with SMTP id g9so17643658edw.10; Tue, 26 May 2020 06:32:57 -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 n25sm1623084edo.56.2020.05.26.06.32.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500006; 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=PeH+WlE00LB+fFQtp7fcWUA1WxMokHKZOrP3JbV6vKk7mVmHTbQLKL0uhphreVsqne4TEE SUYTz36QqobB635cnxMYo2UrRUGVXsdJumBL3MLPyF3L6SxczeHh1WeHawcJyRYm2aMxAc L1h/8YPnxrIyTgECkw+cgR0/noDWjq4= X-MC-Unique: xPXJQgORPVumDLkyb0aXSQ-1 X-MC-Unique: 7TSSnMzeOLKygmK-TgXDfg-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=GKxZ1K+j7tHfb4JH7jH9LF5vzSGoR4rH07jni6ElUnmmbjDxT6RIwn/BjU6oRKb0yI bytJ7mR/qhj/HNAVl51CXhkP7OgXtK7wZD/+pj2VSStpW7FppCJVHyMhELCkD51Th3ER tXlPjJLBGy7gILkhmS2qSrgBGOKBnbCJTVMjaBv4r8BLB1A6w6vC3GBKBCrnaUH/bAIk pXOYmZ6aen0deNbmI/bVmf/Mdq6GNCJXFhenlA70gGF7bjVpmXuAia/GQ4omB1fi62N9 G2zskIUx5b1+2Bu0wWNWpqAoo9LWIV2Q+PGZCovKDMklXSCapt9FB+WibrIHXyiH3bf+ RWdg== X-Gm-Message-State: AOAM531w4ANfLxhjLghE4BqUHzEcyTnUGb+NtgFvOaTv6etYKXs1lW14 rNEq8KSb2zMB89sm2z7KHsk= X-Google-Smtp-Source: ABdhPJyWdSXLY9491hDMgvcO33Na4sZlNb+WpZ5LUv3lhSQND6DBAw8s+jS6/Bs6Ye2KVS6u5zVdgg== X-Received: by 2002:aa7:c444:: with SMTP id n4mr19857088edr.308.1590499977017; Tue, 26 May 2020 06:32:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 05/14] hw/pci-host/bonito: Map all the Bonito64 I/O range Date: Tue, 26 May 2020 15:32:38 +0200 Message-Id: <20200526133247.13066-6-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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.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) 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 Mon Apr 29 12:15:22 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=1590500001; cv=none; d=zohomail.com; s=zohoarc; b=aqITji4jFB9BEin+Z0uenB+JHnjCXxvQ0UjZ2drW2SmNjBSlqcNE0akmxmLE83vFL+zNGd5MAP8wkxOS5DcPUXdnLvA/qdJioocGps/UDUKwr0ZMWIv08lSI7GJEQxfb7EI8CjJEjMUxXWrKkBA6xf6O/12/zH8zeKs+EUwAM+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500001; 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=ZjWj0dUmFcXqSOvS5eV4ZH48B9zS/5L5K/OAOs2OdMM=; b=HcdQRrQ/fR1wokvdrzh0WoUAtlysZBgdjDuGCies84LVFNZ1JKdw4HvX5K5YLMErcMz5TFgf6UR70Ag2wJZF3hHHQUI50zyc6MFM0f40j3x0CpV6Dv0oue9fdIJzSuBM22VFfgZ2jQyjICkTH3m2EW7+wuD7DVl25KhgrIFZRCw= 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 1590500001783357.8793129267167; Tue, 26 May 2020 06:33:21 -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-358-Ma_DO7ycMgWufwDndF-NxA-1; Tue, 26 May 2020 09:33:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 097F8800688; Tue, 26 May 2020 13:33:08 +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 D9AEC60BEC; Tue, 26 May 2020 13:33:07 +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 ABC2262D1F; Tue, 26 May 2020 13:33:07 +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 04QDX38m012407 for ; Tue, 26 May 2020 09:33:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id B5DD25EDE5; Tue, 26 May 2020 13:33:03 +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 A7DD65AB88 for ; Tue, 26 May 2020 13:33:03 +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 7BC818F842A for ; Tue, 26 May 2020 13:33:03 +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-137-j7oCi11GMRyOtQAAkG0K1A-1; Tue, 26 May 2020 09:33:00 -0400 Received: by mail-ed1-f68.google.com with SMTP id be9so17660936edb.2; Tue, 26 May 2020 06:32:59 -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 n25sm1623084edo.56.2020.05.26.06.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500000; 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=ZjWj0dUmFcXqSOvS5eV4ZH48B9zS/5L5K/OAOs2OdMM=; b=e7LIQVC9ceNIIZmMxeyt4Fo6icyiFfNl2gIaRFq3C6BedQ1b3JTQiR/kaxXE0h5fcdAPfD U25RkK3CzR3TtAZDb/4rIIYusqQWottRjCqiQhvDWAPeNHHrW597R5aS425d5/4WePxKB4 J5ItguKjsud87NaDaB6pS96BS2S7YDk= X-MC-Unique: Ma_DO7ycMgWufwDndF-NxA-1 X-MC-Unique: j7oCi11GMRyOtQAAkG0K1A-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=ZjWj0dUmFcXqSOvS5eV4ZH48B9zS/5L5K/OAOs2OdMM=; b=MfBedqoWzeIv5qeObVV12xEgtc79KxkCJeONguPnxGOUtl/MHq9HNyPQEO/23/l28l U4BVrKuim+TBUbbtpUzzmMQZxUB4xXMgpwouovgSHnXBGb58FQgTSIxO/GKKtPMFc7nT ncfja9Se0uUNh0Dmgs7+nJW+XlC/4arIUMZVqzQ1M892hVkn0YM4IaoSi615yEiHl04T GrXdtXux4G+JKHv9I5OPr/aJcQAtsTVf6Zqu1YyNvj0K93zDG1NfhXrr4Fhqet4WVMvP OY4aLjFuOg14ttTzEGvrBUMHig1tYJVgab9I9DFHHyN7Aw8BfZKSYvwjdfDhw5sTxMxj 9auw== X-Gm-Message-State: AOAM530emtHD/jmk44dIUxGiCy6mmEXi01qaGC1kMkt2A6+GFw38D2NE OmHcA94M6qWfrtVuoVnaUE8dz0VNjyw= X-Google-Smtp-Source: ABdhPJy+QzkJ3L07bCS9TKLkT8JyNSsqPfDai0Swx+md90g3+7A3sUKqNYSLjXYEhxeZ4LyCQqy/9A== X-Received: by 2002:a05:6402:2032:: with SMTP id ay18mr19601948edb.281.1590499978445; Tue, 26 May 2020 06:32:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/14] hw/pci-host/bonito: Map the different PCI ranges more detailed Date: Tue, 26 May 2020 15:32:39 +0200 Message-Id: <20200526133247.13066-7-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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.12 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. Reviewed-by: Aleksandar Markovic Message-id: <20200526104726.11273-7-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 Mon Apr 29 12:15:22 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=1590500006; cv=none; d=zohomail.com; s=zohoarc; b=Vhnjc4vxrgCAcElLa91PDBKjGLMp1Mdd+1UbeUIDUSl1mfPQr59RuCl0mjvXTDn2K0ymzjOLVsQjndZbrxlxvXwyWV6UvAkg5DNyzgc0sQb14fdlyrQoVRvoaquwROv1gZmPI6mPz2jACqZdfVDsm6ngtR+NVPWEg7e0BHURZGc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500006; 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=J7IDAlQPPc7KlBam4EMy0zIYUc/7coo9aRYH590xvMPrfr7Mgw6/IKLHTTEntYMkIgSasx2wbGcHkYqgEPfFzlArjf00osg53wBhWARzm9TGSGsUokqdxsR1xiqqi69YwiKHho2jdRrQGl9rueolWdEXAtR64qWowWiSP6I9fkU= 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 159050000650178.46444498999597; Tue, 26 May 2020 06:33:26 -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-174-YvP_07PJO1OBhIXf0jw7CQ-1; Tue, 26 May 2020 09:33:22 -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 497B71855A1D; Tue, 26 May 2020 13:33:12 +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 2771A83C05; Tue, 26 May 2020 13:33:12 +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 ECBC26B493; Tue, 26 May 2020 13:33:11 +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 04QDXAHL012444 for ; Tue, 26 May 2020 09:33:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id BD7A45EDEE; Tue, 26 May 2020 13:33:09 +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 71D365EDEC for ; Tue, 26 May 2020 13:33:09 +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 35A0380066A for ; Tue, 26 May 2020 13:33:09 +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-123-oNhRnS4jOy-kYq7W39OQ3g-1; Tue, 26 May 2020 09:33:02 -0400 Received: by mail-ej1-f66.google.com with SMTP id a2so23784519ejb.10; Tue, 26 May 2020 06:33:00 -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 n25sm1623084edo.56.2020.05.26.06.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:32:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500005; 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=SFZE7B9HgWVBDsN6MAQ2OQCJ8w2eraFdMQzU5JdsE8/+hONdPHKKIwMBwbXjeocCNxq5Yy 3AiQWwwzAZW28G3TgDStG5F9/NDC/S5AJY9Zi079dAQu2wPKxiuQ6iX/+OyAI5MzQzcc0w lwyV21ZwRwnJV7zCupfSj7mSLEIWoBM= X-MC-Unique: YvP_07PJO1OBhIXf0jw7CQ-1 X-MC-Unique: oNhRnS4jOy-kYq7W39OQ3g-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=KXowtGISA1XVJzJ5+fwsH/I6W/XpDvWmYbC1jHOepBLqDJhPpgW07PffzOvwMB7Xyg ZhmMPvyXtxOojZdspGCA06e0k8HQBVwzuX6sSTK1iQiQQbTMogiuBgp0xoU6FJAZ9eq9 zBnu+HRWdMMet8wmZokxmtGmIRzGDOpL2QtUhjsO0cjDG+iSggpK+P66mMpHgA+I/IxU 18NXTHNkirBgIM7IzcRqYNFmG+Zen4N7L7GiOwB9akH5CIlSkvT35beGp+79qKIKvpT8 VivXvqJ5jFOFPPjyGVFarNJw7XQ2/D5vsavvunkdq3aeFR2d2OtYN4U1WncJZM5TJ+xw qukg== X-Gm-Message-State: AOAM531JSOrS5ue0EHA/1D1OrLhhPpQEv6hM05vpGtwO6vzbYwQVSZkw 1KzlYkGXWEecqjqOrkI9K/YrawkZ3eU= X-Google-Smtp-Source: ABdhPJzUY1mUjqfY86NxCT30EKGDVSOLNKM9YhYJAw21KF/OkFe4oJC9gCeR4bBH8SluGHqM1JaFuw== X-Received: by 2002:a17:906:b348:: with SMTP id cd8mr1127899ejb.139.1590499980033; Tue, 26 May 2020 06:33:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 07/14] hw/pci-host/bonito: Better describe the I/O CS regions Date: Tue, 26 May 2020 15:32:40 +0200 Message-Id: <20200526133247.13066-8-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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.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) 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 Mon Apr 29 12:15:22 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=1590500010; cv=none; d=zohomail.com; s=zohoarc; b=SzY0C/mLYdS4Eqdd/ay658INtXo5ZxP6f9t/lsK7bEMDf4vX1NdxCmiaJWjl83D0ObFAYvwLJLDylbiePRFoQ5JPuhjoKELVGDNHLXb3o3hMFXbMyyFLQSkbzoFHVxj2Dcodx5v6kgc5539OH43QzjKc7myAy8qIFTN0uoLWrkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500010; 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=fnimjULxviFhEPcgRO5IMIN6WWxIRsICB8GaIWs7QnIb9y4a8z+FdetvfFUJQIGSCvlB1Z6Zl/hq6rizNRwpN5ycOK+5+5y2POmaQ6fRiSURpT5fXtRBjCokU0e8XB5RjdxyApXjjHJzp/hAXD0bDUjU+XqhmmB0/XkU2msH420= 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 1590500010238838.4012404422739; Tue, 26 May 2020 06:33:30 -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-384-Eari3kobPhGZ3jaRVeBLvw-1; Tue, 26 May 2020 09:33:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2FF191855A20; Tue, 26 May 2020 13:33:15 +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 0CC7F610B0; Tue, 26 May 2020 13:33:15 +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 D04876B499; Tue, 26 May 2020 13:33:14 +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 04QDXB9J012462 for ; Tue, 26 May 2020 09:33:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 595435AB8D; Tue, 26 May 2020 13:33:11 +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 435CF5AB88 for ; Tue, 26 May 2020 13:33:11 +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 1BECF862F84 for ; Tue, 26 May 2020 13:33:11 +0000 (UTC) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-8Xg5VK1CML2QLWrmarx6Eg-1; Tue, 26 May 2020 09:33:04 -0400 Received: by mail-ej1-f48.google.com with SMTP id n24so23831525ejd.0; Tue, 26 May 2020 06:33:03 -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 n25sm1623084edo.56.2020.05.26.06.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:33:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500008; 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=ewmUMd5QIprAyxYmLVaZjUl09KtQ5y7Yvr94LI4Rrl/dyT1eNSnRBNxM3Iwl13GFDr+4zz ecA4DHmOeTvD4vSXNp6b1Qbk4ZMJUrP1DXNpc8FkDls7mJY1whmABMOhbxspMhhvQIoa/O 3xCK4SlY7qIstC0Y4qkztWQ6mraxQro= X-MC-Unique: Eari3kobPhGZ3jaRVeBLvw-1 X-MC-Unique: 8Xg5VK1CML2QLWrmarx6Eg-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=Pk1pt1b3FswG0Qbv/eg5Ccu7dnDnxropqzJ1uXo392kazvmzxULG7Yi+pw5ia2Ttn6 lRasSSoMlEMyr/uEHjaCDTgs7gy4E/+MYCp8pwk1QxPETZXhI2i7hjk50ntk2B7xSztA JGnmPjTXCXqxI94K0SAzZd85125lcInbhVCh3G7srpjuh75LyBzM7T2iyA+M8UB+nTdH +1dWjK2JFnKCCxVebUyLQnx8DhEGeKpALxBjJK7gfq84wrswpZql/RhJdCdxk9xVhrIt DCC8kwmZbXI1Fxj4sYaJPKX8i1Kxd5A1ZdkE5EMGEy6ZpyeZUsMLjnL+votGnwHPfA7d jcCQ== X-Gm-Message-State: AOAM533T0qbDueHGMv52wzR3zeYGd04SSjBMljUKM49akHBibxUnmWwj uQnyEad1fpni4qPfS8SY5Fg= X-Google-Smtp-Source: ABdhPJybldAC6vnDY3YrrHQfs46A6e72b/KGxAMMaVxfoZiliFeAqmoOvL16jHYuofFSbupHFeaBng== X-Received: by 2002:a17:906:379a:: with SMTP id n26mr1100313ejc.513.1590499981758; Tue, 26 May 2020 06:33:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 08/14] hw/pci-host/bonito: Set the Config register reset value with FIELD_DP32 Date: Tue, 26 May 2020 15:32:41 +0200 Message-Id: <20200526133247.13066-9-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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.12 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 Mon Apr 29 12:15:22 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=1590500009; cv=none; d=zohomail.com; s=zohoarc; b=Pb/bK2FmBpmeqeUbF+ltgz/0dJFyrdmCxkB/nAvceNQnjou6HCP8U+s1avSr9n24T5545wammv6DroETUm3QqY38rsgch7Si1UeeghLnRBHCTB6SKtWuiadR2VtsKvpJumfEp9TqDpXZEHZ3mYEaigmLcjWpl8mPbMxUHL10Wg0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500009; 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=OontZyi+hGolaZkWOIerjRInO5f95+N2Ay1JlLbZ0v5SvRoahHhvj5mp8CeSmSuLvhAKMELMAtFX4Rj1hTeYuP4bg3eY3rAZ64pCD+h8wVH3HnmLM6/+D08fk/80wGuLBagHnxoLBeRFY03zzKFFJwLheEFSWBX3p7NKdnF9duM= 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 1590500009674676.4971014999768; Tue, 26 May 2020 06:33:29 -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-473-G0_ZL43dOh6k6H9hINcaQA-1; Tue, 26 May 2020 09:33:22 -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 C96D01855A21; Tue, 26 May 2020 13:33:12 +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 A722E1001268; Tue, 26 May 2020 13:33:12 +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 751FA1800429; Tue, 26 May 2020 13:33:12 +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 04QDXAjp012450 for ; Tue, 26 May 2020 09:33:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8C8D02026971; Tue, 26 May 2020 13:33:10 +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 4DC0E2029F62 for ; Tue, 26 May 2020 13:33:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 1C52E8A5E4C for ; Tue, 26 May 2020 13:33:10 +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-150-BCAd3TX5MmiI3WU8y_mGKQ-1; Tue, 26 May 2020 09:33:05 -0400 Received: by mail-ej1-f67.google.com with SMTP id se13so23793819ejb.9; Tue, 26 May 2020 06:33:04 -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 n25sm1623084edo.56.2020.05.26.06.33.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500008; 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=EKvZEsNmN3YN1Z2V23/ZK96xlsuoEntT5qBXttlPsnZm7/PRrGdwQpWqYwbdPOzJ0j9XLN goRXIjlxUk9afeavZCQ4Pa1ECgiwdC0D97aGWIpH/eB0niS+HhL2Zy9nlLG5dLrWWSSioT Z7TGIKVhUDaMZTsa+TkYHdIFwYRHmSY= X-MC-Unique: G0_ZL43dOh6k6H9hINcaQA-1 X-MC-Unique: BCAd3TX5MmiI3WU8y_mGKQ-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=qkP/DKv00ZdQWr02Gj1iSpTlQ4WEV7bx6bZoZ33y0b+IcEGyogzpU32XlCmhX1+nrV 3nk+mS82zQBK65Z26rXtpXUj2tepkHeqKcw/ZBQufm9ipyJ0y36ND0Ye8Rq9+9DdIv2N +nI1pAyox1yBfN25G+LY3LikJia0eOa1mqCDEHYNxo5jFqPVCNEHT12zBelTMTx6wrAG KMQ1T3HMavhVAbH2spmjFlrVXTunEW3jRfzxZM3l2A7IZOhRlq7ApFUKuwn1psv/8XAK txFMmyv0WRzTxEmxEP8WK63ldYhHRTZJw4KwBpXWqJSb2WPvfmwvIAlKiOnmbnBGJ1cP 642Q== X-Gm-Message-State: AOAM533kswFF0L7tP6uDDojXIqdnm4ZDKVnmeWBQoUQfSslwRglDvEWX qxCU6gnIwaszdZUqxBYiMD0= X-Google-Smtp-Source: ABdhPJxj4QYezkhS7+Sy+MlLzKtbDDpFMGDXmjmG0CfPbQKHZgOgtGgOjALCwDSmxrI6+t6Nf1iFDw== X-Received: by 2002:a17:906:f84b:: with SMTP id ks11mr1190807ejb.114.1590499983197; Tue, 26 May 2020 06:33:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/14] hw/mips/fuloong2e: Move code and update a comment Date: Tue, 26 May 2020 15:32:42 +0200 Message-Id: <20200526133247.13066-10-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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) 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 Mon Apr 29 12:15:22 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=1590500010; cv=none; d=zohomail.com; s=zohoarc; b=VAqeqKU5qcBeEKzK9i2DSQlCIcL7v668t+j0ciRZtlHfXPnRbqRA3n5O3ezKIo1F5tQ34HIwnH4pFqebrj3wuD2lgwYx/j9WOqo0ZtIMWjQSGPH7RgKpu7kkuyuYhXVasrPML5oaT7WJlRhmdVrp7SeMQuPFHBtIW73+HsIpyeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500010; 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=0jEyZXKOfk0NVUMitEyrP1npgDeWXpetzdjuJB0NJgA=; b=GdNPfKrm/FkaPGUHzeFgxfVjbtDIEBZYltD50LSvictnmfL8NOgINBtobTfeHm6RnSlfRTMpe+cfvVoj20jZUXTY7RLYQNauKbYR1KTXhVYabfAy818ukX8W2Kgp1fT1EyfpRl97udS4iYkdlosIk7lBFtYctUiZbk1+iazcTLg= 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 1590500010129813.8629793935429; Tue, 26 May 2020 06:33:30 -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-398-8zi27MKmNj2Gbl44A_5bOA-1; Tue, 26 May 2020 09:33:25 -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 90F63EC1AB; Tue, 26 May 2020 13:33:14 +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 6AC5010016DA; Tue, 26 May 2020 13:33:14 +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 36E406B499; Tue, 26 May 2020 13:33:14 +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 04QDXAb4012449 for ; Tue, 26 May 2020 09:33:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6F3A92029F79; Tue, 26 May 2020 13:33:10 +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 4DCC32029F6F for ; Tue, 26 May 2020 13:33:10 +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 15507862F7A for ; Tue, 26 May 2020 13:33:10 +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-31-s72spkJnMNmCcGEn0Ku03Q-1; Tue, 26 May 2020 09:33:06 -0400 Received: by mail-ed1-f66.google.com with SMTP id b91so17684984edf.3; Tue, 26 May 2020 06:33:05 -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 n25sm1623084edo.56.2020.05.26.06.33.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:33:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500008; 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=0jEyZXKOfk0NVUMitEyrP1npgDeWXpetzdjuJB0NJgA=; b=BWMqWWbrTQWKnDSoqKc6ctg9Gy4M3oTt5JzxQgCchSbcBYZi+nmvhdjkZtMD92os/X+gun rhne26fpjWUMVxCSi5mtCItuPh/mpF+8VRGOM7VLyTYpY7rEEUkw5Qp4BhwRy/XW4I0SEg Lqr1ZCxt2Aa8e6qsjvyAf5ZTjq5+No0= X-MC-Unique: 8zi27MKmNj2Gbl44A_5bOA-1 X-MC-Unique: s72spkJnMNmCcGEn0Ku03Q-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=0jEyZXKOfk0NVUMitEyrP1npgDeWXpetzdjuJB0NJgA=; b=SN+/IcSzYYH1+mF8c8X6D6FldOVLHWFKRHzIGZvhOmtPcoDy90/0onl+KiNNQZpO/K aV9IdgIbNQMvscXaY6jXQE/GQ7NRgS/byPHikIhBYCbF7nSZuPz24oVKejwk8/HMlKHX vAfJyJN3lDfySk9IZsFZ17ZXWqQZUU6oAHXZaub4DBFcb4zZW7dqw8C+uJU2QwOi5rAy F0+FezY16cTtCVIDRortoQpQBmlzgLLHedqrppUa36/9fgPZxjJh4qqXDkSTKh0MRrlf Xk9UUCOgij4MuzTwUKAF1gX5/fRnUOrWQHpP9IWnoaMQxlVZgXMd37hysc+XU+g5dxGs uQ7Q== X-Gm-Message-State: AOAM531WildlxTkCzc8ZYiJvMImfpyjXxwfYwvSUEFD1+3ZZFvq7plY6 dMKXlqezBAbYLBy+HmZ+jZs= X-Google-Smtp-Source: ABdhPJwBBMw9oaNKH7TmJAfPkRcxOkYBFE2cSamRqoEZP5XLebPIcKNZKIR2+qzW1Miq5iHHQ54gPQ== X-Received: by 2002:a05:6402:22d1:: with SMTP id dm17mr19160025edb.299.1590499984725; Tue, 26 May 2020 06:33:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/14] hw/mips/fuloong2e: Fix typo in Fuloong machine name Date: Tue, 26 May 2020 15:32:43 +0200 Message-Id: <20200526133247.13066-11-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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 , 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) We always miswrote the Fuloong machine... Fix its name. Add an machine alias to the previous name for backward compatibility. Suggested-by: Aleksandar Markovic Reviewed-by: Aleksandar Markovic Message-id: <20200526104726.11273-11-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 Mon Apr 29 12:15:22 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=1590500013; cv=none; d=zohomail.com; s=zohoarc; b=WkeGOeRAgXVgMAf3ov9KsYbYpc++rJ7BACLkemam/6HNwBupFMIuv6jHt9jH8pmMNZgr82F+K/mSxjtwD3U7ZDN1we3x/febH2VoRVvaRQ4Ihev4ra43ZL+cp3rG9pMxgNjhwthBr0CHtjGiesYMS1HYQ1my1JEjpLRpQbDi/tU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500013; 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=AZLK3vQx5+l3Y9SB5ToKHYIdbtgK83t0MqCoWMgEWxccK4Vkdylac23AQbBQAc3lcuK0J41xktV5j9BxbgTQFoDVVOXj6ln/JRsTj6/xEw5dxgzqqhcz/XfNI7+137coKk7kQJpmQ3CEiYw0oidZLn/QwzEOQOsros6K6YfiUfM= 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 1590500013015522.6144908426855; Tue, 26 May 2020 06:33:33 -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-139-uaVyG5t5PWeUDBgvhp6g3w-1; Tue, 26 May 2020 09:33:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7FDB108BD09; Tue, 26 May 2020 13:33:20 +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 A89315C1D4; Tue, 26 May 2020 13:33:20 +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 766AA1809547; Tue, 26 May 2020 13:33:20 +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 04QDXH83012502 for ; Tue, 26 May 2020 09:33:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3C03B2156A2D; Tue, 26 May 2020 13:33:17 +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 2964F2156A3B for ; Tue, 26 May 2020 13:33:17 +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 F232C862F82 for ; Tue, 26 May 2020 13:33:16 +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-103-B6sJ4QXHPUSVSZ19FJ3PQA-1; Tue, 26 May 2020 09:33:09 -0400 Received: by mail-ed1-f50.google.com with SMTP id m21so1112223eds.13; Tue, 26 May 2020 06:33:07 -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 n25sm1623084edo.56.2020.05.26.06.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:33:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500011; 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=V7BFBn/s3ZIzP0GOQQYudYXlbAHnBDaesPfVO6M63x5gg65T30B05aLeg8QJ3XLB+2g1o3 RBd8qid4VAT8+hmm5jQkxvoV6Up5SIkjk6BvvrqdDHdvCHjFs4KWN46IMyLkPTGVDF+Mfn XIEHxOzRRiYLCCNklMC2ZTMLhUydxUA= X-MC-Unique: uaVyG5t5PWeUDBgvhp6g3w-1 X-MC-Unique: B6sJ4QXHPUSVSZ19FJ3PQA-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=XcpBH50jaTWa5LRFyx2iyiYS3Affbecc+pA7QJ2AsJyqmzzAJHkUG0r0dNgTKrtjo5 1W5ArKYfRMRmaSjpXxoC15slOabDYmqhV3v/fIFJiu3m3+gerDIyMESL07u4EDsvFYcD TL+/Ek5OBEIboCULpjvuGztEmW+RQD+z2h9BbcTc9jBAvFY79I9yxkLRCBZgjK81sX47 wE8geWH2zlOI+dRYcbZPqr/AHHy92vxYNfZ0/kZGdYXmnIUzkVmnfWRGGq4DJJrWs3Ha 2l6ili5RixVxPOO4uKtDVzIrZVCbfsfq7U2upQ0T46TQ6OxqSa1otKml5LmlOkDTVjmz Ilcw== X-Gm-Message-State: AOAM5338K+tenZcKb1LviKHwz6u8qUY+cvBYYZHLJUXEKa2d04AgNU1j msSfNvsgNlyBll1mJ0un5ik= X-Google-Smtp-Source: ABdhPJx7avSR9b0IO/bFYQNE/KO1XlTDYcp0o/zU7LDoy5ZTkcF4YTwp0Ln+48NWn2gBdmgXI0iSFg== X-Received: by 2002:a50:abe3:: with SMTP id u90mr20016260edc.278.1590499986220; Tue, 26 May 2020 06:33:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/14] hw/mips: Rename malta/mipssim/r4k/jazz files Date: Tue, 26 May 2020 15:32:44 +0200 Message-Id: <20200526133247.13066-12-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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.16 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 Mon Apr 29 12:15:22 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; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1590500012; cv=none; d=zohomail.com; s=zohoarc; b=fvycl/2JL00llDa/R5YNG5ZtLX0VHqBwCXHV/YfyPkYlq7k/wwpOI1RNiytQ/ZnOfFIyl+PjjW49ykBnma2ZnO98f5Hs8WBj0E7ElpQIaVudxcIW4vDReh5Iv95pDTt7WHuH9HJ23R3eK9Tz6KSTVFggWgUlIgTc9BdnV8Xs6Xk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500012; 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=TmaZreFlFIlLVbdcDFNeLUjXK0eq15pmMXbtzeGzd1bGYFb3kre4NnLFX5Tn+gfSiMW+XkCMkauIJeM2RlJGnH72DRJgDpejTpTiTzb23l3LAVlP6V05FRhwdOOd1qyJu3APYYBqFUfHvzLH/9c+7A+Z6U99OSCEeVeDJLqVqYk= 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; 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1590500012617132.6483514129194; Tue, 26 May 2020 06:33:32 -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-100-AT8NL_g3OdmkOIn20PJbJw-1; Tue, 26 May 2020 09:33:28 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CF02E18A072E; Tue, 26 May 2020 13:33:17 +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 AD8FA5C1BB; Tue, 26 May 2020 13:33:17 +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 818C36B499; Tue, 26 May 2020 13:33:17 +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 04QDXG8G012496 for ; Tue, 26 May 2020 09:33:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 699472026972; Tue, 26 May 2020 13:33:16 +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 501F82026971 for ; Tue, 26 May 2020 13:33:16 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (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 BB5CE80D683 for ; Tue, 26 May 2020 13:33:15 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-50-klAVjUjZMR69yQfG1IDQlw-1; Tue, 26 May 2020 09:33:09 -0400 Received: by mail-ed1-f52.google.com with SMTP id e10so17664426edq.0; Tue, 26 May 2020 06:33:08 -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 n25sm1623084edo.56.2020.05.26.06.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500011; 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=bOTPw3SHfcIbGwQfKTsrF5lAAFuW1rMoCXUGACg4CUaOuxfnvdXX0dS0Yk9Ns1WHtbNY9J LpnsFjIjJzQzWalTumIt2FTEO12zf8Pe1Hb03+SrVSFcZ9Gctfe0BA+dFip/K2+r5S6+6B ZFiLT+MexrUPNRdnrnke1eqSIrz4bus= X-MC-Unique: AT8NL_g3OdmkOIn20PJbJw-1 X-MC-Unique: klAVjUjZMR69yQfG1IDQlw-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=EwSijc0G4/utzeZntcyb7Y/tHFX6KJSrUw13yl2JfopwDucnUOwkGkmyTj07ZjOxjP y1B+cufFzpPO88R+iJDgjSP5qWpxzyEQ1dR6+ZS8uADaNSgK3eBq1zOQIHjPmrDkDzQs 89pUA6VZrQhtwb4nXs4GPJp0Y3Fi3cSkCKrPwkLXjRItovKppnDJ6ee3aVFVc9zLa1Pe qZBZQuCIX95UoZCjcfmt9TzH0Q6knsXa9b+Kiv+5TRidryQctwfvOTSWPS9vyjcZrRXR Ps9v0zK567ogokazkE5FOI4mwapeG6ss/5tuxELruspH+yShIAEyNuKLpITbSwa6apNM 8U9w== X-Gm-Message-State: AOAM530HZOqWSbi3p78Ljv4YbRpsMkzaHUlbLPIFHfohDe+zNe4H/qxW dXbaT04d4W2l8ufsr+1YKlE= X-Google-Smtp-Source: ABdhPJxb7icFxfWH/GZOXulDFhi/cWtfATQReFSLmTJ3bbfzdxGr0+61zoopkwjRIIneAiOE44TjFg== X-Received: by 2002:a05:6402:1447:: with SMTP id d7mr20695849edx.367.1590499987728; Tue, 26 May 2020 06:33:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 12/14] hw/mips/malta: Add some logging for bad register offset cases Date: Tue, 26 May 2020 15:32:45 +0200 Message-Id: <20200526133247.13066-13-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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.16 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 Mon Apr 29 12:15:22 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=1590500014; cv=none; d=zohomail.com; s=zohoarc; b=IEGbITmWYQE83UQg3PEN0KGk8XFc7lvfVuNbwhh2HuPrne36KvVqqHpIiOJpJcdoxTyMS/URy7OQJB1bx9rWUgENP6Zjyrv13Ru2liNv3ZLoL/5vWkt1GJsCUSm3B4VQVivLEUF83gBZffgLSvN85Rfs+O4YE8vID6OZmHstS6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500014; 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=l7x37oC0tcs8MSoTISsa64Nw8M1j2zzVtQGsW4/zd8eLgPTPlUN9t7z8axQVSovvufrzZQGardIryNaBXXFBdU7DzyhY8wJ18Yet5EJ7at882Bsn7ntLMljbjZZkSqZXgO69zBHYsIu4D/SSgN4YmPwH+7kjsiSiFwjLU0Qkn3A= 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 1590500014492107.8759397709556; Tue, 26 May 2020 06:33:34 -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-142-qd4-QZ6RPzu9aVY7LPuwEw-1; Tue, 26 May 2020 09:33:30 -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 170722D56; Tue, 26 May 2020 13:33:21 +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 EDDE9703BC; Tue, 26 May 2020 13:33:20 +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 BD5521809563; Tue, 26 May 2020 13:33:20 +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 04QDXJX8012517 for ; Tue, 26 May 2020 09:33:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 696092166BA4; Tue, 26 May 2020 13:33:19 +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 5BB9E2157F26 for ; Tue, 26 May 2020 13:33:19 +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 2982C862F63 for ; Tue, 26 May 2020 13:33:19 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-235-U0vGuhpIMJWohDC1iC9_-w-1; Tue, 26 May 2020 09:33:11 -0400 Received: by mail-ed1-f52.google.com with SMTP id g9so17644345edw.10; Tue, 26 May 2020 06:33:10 -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 n25sm1623084edo.56.2020.05.26.06.33.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:33:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500013; 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=VgGi3zdy9N4Gu8nrcTeoUrhB6Ue6UsMnqN8e3j246GUIhICBVPNoQ9SF0Go/Q8unM12mXK jJjffqdj6CoG9aUx1Sy4QOqfuTLB2l5gMXXMVCK33341lV4eThhSUiQ6uJU17K2JkwiZPF /uWq2RrtDRY21CM9QLnwkRLLmkBVx6Y= X-MC-Unique: qd4-QZ6RPzu9aVY7LPuwEw-1 X-MC-Unique: U0vGuhpIMJWohDC1iC9_-w-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=nJ+oLXWssUJPeu2Bt++ClhghDBl+JEgqFyF5bqg1Pksd9SqIyNzSzWvJO0uLklnqHw YDjjyYQv7JvNWqPx2Lui/lBm2Rtc9nklJGAFSQ9G4zuIxqUL7jMzVCoM9qwGVCT1lEyS /Zp1sozVO0gITtGvXfjl/hvr+YAGMBEsB9HkDF54gqx//ZXWOejqBIa7C/ytIvy311/z XdKELOQOcfD1VH/xYpdlObhMl+jZmbZYCwOAH7l6Dksh5jKtd5uZ1su6TQwyoix0F++q +mdU9ONtOdKL/l+MBRFfyDHD3yJVZRrSQUSM8fM9g1ZmX7EITtiOku2U3mLRLOv2QOEH BACg== X-Gm-Message-State: AOAM5332meDtQsirecCMi3+LXsLeD/uiqZURXJ680f8S98Kcwc/gKfpw jKsaF0ZnbW1MBWg9I+s7/co= X-Google-Smtp-Source: ABdhPJyhe8NpcMddqxli+7/P7ZF4MbpIJ2/9Jo4E7uADaHqbr/LsGsvWVSz60OKuxbSdJVyVpp4SvA== X-Received: by 2002:aa7:c444:: with SMTP id n4mr19858176edr.308.1590499989149; Tue, 26 May 2020 06:33:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 13/14] hw/mips/mips_int: De-duplicate KVM interrupt delivery Date: Tue, 26 May 2020 15:32:46 +0200 Message-Id: <20200526133247.13066-14-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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.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) 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 Mon Apr 29 12:15:22 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=1590500024; cv=none; d=zohomail.com; s=zohoarc; b=ZtL10BY2ADOE++pDfeRcxe1Tx4F+NLBgt6AFfyPbTL3YuixUeQQL6nzed/mfZRebmIn2QLEnS0kl6YMOcbVZ9qie3pW1H1onBkxwFtkesMgu47TpY1WgBegZUFdiepB/YYYfoUJwhyIA7BC496dPiTng+bwkflOn+/PYddl2Kic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590500024; 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=iYnzHfmcyPbVvqBgzulCx2ezdNZnucaFk31jaNV/IIcaD+kNJ7NSr5VfGTpGDdnCUQH7KRlLvkPnxAUMd5GjNsbKxgVXKB9KWsRcTdHMHnrLAsLkWHlF8M8C2wkYVPqkDSfRYM6RjPOFojPd9sgSxB3YRmBX/osiyyCGPAP1QoM= 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 1590500024382683.2150853912188; Tue, 26 May 2020 06:33:44 -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-305-O4xsWhuOMKqaTn0_0GPtdA-1; Tue, 26 May 2020 09:33:40 -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 802027BAD; Tue, 26 May 2020 13:33:35 +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 620756ED98; Tue, 26 May 2020 13:33:35 +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 2FE1C1806B0C; Tue, 26 May 2020 13:33:35 +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 04QDXXHO012564 for ; Tue, 26 May 2020 09:33:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id A7BED9D52; Tue, 26 May 2020 13:33:33 +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 393B742AC6 for ; Tue, 26 May 2020 13:33:29 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 A159C108C276 for ; Tue, 26 May 2020 13:33:29 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-362-CN54mBydP76DKRoTGpTbwQ-1; Tue, 26 May 2020 09:33:12 -0400 Received: by mail-ej1-f42.google.com with SMTP id l27so1708783ejc.1; Tue, 26 May 2020 06:33:11 -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 n25sm1623084edo.56.2020.05.26.06.33.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 06:33:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590500023; 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=P4dyQBtL1IOZjSXOppqxaohl5d5eR2WwUhhyt2S4O9/fL9BZBPBtvCdN60HdhhTPo67wjf WYtsez7tsmUSOKAlxMlRfiPYLM+XzRF794R4gmOUK+KG7uGEKHIaId2s5NwlDhnVHU02OY SL/g/2C51FzgfHwN0yE7u+OFVghxFG8= X-MC-Unique: O4xsWhuOMKqaTn0_0GPtdA-1 X-MC-Unique: CN54mBydP76DKRoTGpTbwQ-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=nw+cQFpMKjq3bwBadegp73xtVHZ3NUrxajZ9I2oEKSmEVz1/qqDG58L5mnOeul0TE/ TQMUFoPLel0MYVjSf+/LYa4TCdBh2E/AKxcNDDooxvUm52j2BYRZSUBh1cUINduoYO+8 yqJqlo5Dz2Pir379xGeDeT2OofGJZOImHgir7H7cllNM3ehdNTmjU6Z6f4UO4ZbbltJ9 O5/Tukcu0BbzzKxfdWW/1S+vU5GhN9L3iuv5EdYWHCgf0BDJtGb+swFgNoU+24TeHMdj opF9UILbjQa3IEJuwGSqhc4jFEzEpb8of2AUISV5XC8LOipOrfdXz59/g+/r7/fCf6Qy ghsA== X-Gm-Message-State: AOAM531C7zUsyQYOiPofUOveKlZlZ2Jeuxo6A0B77vm5tR5wYR5U0QPi R0lQJRuhQO4vCSpMz2RuaM0= X-Google-Smtp-Source: ABdhPJxZQ3xrejlUHBn6UZjExFOrdzOzBr3xqGngyOSsnoUpEWmtvMLtz2AmdpSlStqjzl+MjhOlIA== X-Received: by 2002:a17:906:edb5:: with SMTP id sa21mr1161894ejb.78.1590499990526; Tue, 26 May 2020 06:33:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 14/14] MAINTAINERS: Change Aleksandar Rikalo's email address Date: Tue, 26 May 2020 15:32:47 +0200 Message-Id: <20200526133247.13066-15-f4bug@amsat.org> In-Reply-To: <20200526133247.13066-1-f4bug@amsat.org> References: <20200526133247.13066-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 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