From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA4FBCA9EA0 for ; Fri, 18 Oct 2019 13:50:58 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 95B1C222BD for ; Fri, 18 Oct 2019 13:50:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95B1C222BD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLSeV-0006C7-De; Fri, 18 Oct 2019 13:50:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLSeU-0006Bj-Px for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 13:50:46 +0000 X-Inumbo-ID: 48a94902-f1ae-11e9-a531-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 48a94902-f1ae-11e9-a531-bc764e2007e4; Fri, 18 Oct 2019 13:50:46 +0000 (UTC) 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 mx1.redhat.com (Postfix) with ESMTPS id 740D9302C076; Fri, 18 Oct 2019 13:50:45 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4682F60BF1; Fri, 18 Oct 2019 13:50:38 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2019 15:47:49 +0200 Message-Id: <20191018134754.16362-16-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 18 Oct 2019 13:50:45 +0000 (UTC) Subject: [Xen-devel] [PATCH v2 15/20] hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Marcel Apfelbaum , "Michael S. Tsirkin" , Paul Durrant , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" VGhlIElSUSBSb3V0ZSBDb250cm9sIHJlZ2lzdGVycyBkZWZpbml0aW9ucyBiZWxvbmcgdG8gdGhl IFBJSVgKY2hpcHNldC4gV2Ugd2VyZSBvbmx5IGRlZmluaW5nIHRoZSAnQScgcmVnaXN0ZXIuIERl ZmluZSB0aGUgb3RoZXIKQiwgQyBhbmQgRCByZWdpc3RlcnMsIGFuZCB1c2UgdGhlbS4KCkFja2Vk LWJ5OiBQYXVsIER1cnJhbnQgPHBhdWxAeGVuLm9yZz4KUmV2aWV3ZWQtYnk6IEFsZWtzYW5kYXIg TWFya292aWMgPGFtYXJrb3ZpY0B3YXZlY29tcC5jb20+ClNpZ25lZC1vZmYtYnk6IFBoaWxpcHBl IE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KLS0tCiBody9pMzg2L3hlbi94ZW4t aHZtLmMgICAgICAgICB8IDUgKysrLS0KIGh3L21pcHMvZ3Q2NHh4eF9wY2kuYyAgICAgICAgIHwg NCArKy0tCiBody9wY2ktaG9zdC9waWl4LmMgICAgICAgICAgICB8IDkgKysrKy0tLS0tCiBpbmNs dWRlL2h3L3NvdXRoYnJpZGdlL3BpaXguaCB8IDYgKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDE1 IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni94ZW4v eGVuLWh2bS5jIGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCmluZGV4IDZiNWU1YmI3ZjUuLjRjZTJm YjljODkgMTAwNjQ0Ci0tLSBhL2h3L2kzODYveGVuL3hlbi1odm0uYworKysgYi9ody9pMzg2L3hl bi94ZW4taHZtLmMKQEAgLTE0LDYgKzE0LDcgQEAKICNpbmNsdWRlICJody9wY2kvcGNpLmgiCiAj aW5jbHVkZSAiaHcvcGNpL3BjaV9ob3N0LmgiCiAjaW5jbHVkZSAiaHcvaTM4Ni9wYy5oIgorI2lu Y2x1ZGUgImh3L3NvdXRoYnJpZGdlL3BpaXguaCIKICNpbmNsdWRlICJody9pcnEuaCIKICNpbmNs dWRlICJody9ody5oIgogI2luY2x1ZGUgImh3L2kzODYvYXBpYy1tc2lkZWYuaCIKQEAgLTE1Niw4 ICsxNTcsOCBAQCB2b2lkIHhlbl9waWl4X3BjaV93cml0ZV9jb25maWdfY2xpZW50KHVpbnQzMl90 IGFkZHJlc3MsIHVpbnQzMl90IHZhbCwgaW50IGxlbikKICAgICAgICAgICAgIHYgPSAwOwogICAg ICAgICB9CiAgICAgICAgIHYgJj0gMHhmOwotICAgICAgICBpZiAoKChhZGRyZXNzICsgaSkgPj0g MHg2MCkgJiYgKChhZGRyZXNzICsgaSkgPD0gMHg2MykpIHsKLSAgICAgICAgICAgIHhlbl9zZXRf cGNpX2xpbmtfcm91dGUoeGVuX2RvbWlkLCBhZGRyZXNzICsgaSAtIDB4NjAsIHYpOworICAgICAg ICBpZiAoKChhZGRyZXNzICsgaSkgPj0gUElJWF9QSVJRQ0EpICYmICgoYWRkcmVzcyArIGkpIDw9 IFBJSVhfUElSUUNEKSkgeworICAgICAgICAgICAgeGVuX3NldF9wY2lfbGlua19yb3V0ZSh4ZW5f ZG9taWQsIGFkZHJlc3MgKyBpIC0gUElJWF9QSVJRQ0EsIHYpOwogICAgICAgICB9CiAgICAgfQog fQpkaWZmIC0tZ2l0IGEvaHcvbWlwcy9ndDY0eHh4X3BjaS5jIGIvaHcvbWlwcy9ndDY0eHh4X3Bj aS5jCmluZGV4IGMyNzczOThjMGQuLjVjYWI5YzFlZTEgMTAwNjQ0Ci0tLSBhL2h3L21pcHMvZ3Q2 NHh4eF9wY2kuYworKysgYi9ody9taXBzL2d0NjR4eHhfcGNpLmMKQEAgLTEwMTMsMTIgKzEwMTMs MTIgQEAgc3RhdGljIHZvaWQgZ3Q2NDEyMF9wY2lfc2V0X2lycSh2b2lkICpvcGFxdWUsIGludCBp cnFfbnVtLCBpbnQgbGV2ZWwpCiAKICAgICAvKiBub3cgd2UgY2hhbmdlIHRoZSBwaWMgaXJxIGxl dmVsIGFjY29yZGluZyB0byB0aGUgcGlpeCBpcnEgbWFwcGluZ3MgKi8KICAgICAvKiBYWFg6IG9w dGltaXplICovCi0gICAgcGljX2lycSA9IHBpaXg0X2Rldi0+Y29uZmlnWzB4NjAgKyBpcnFfbnVt XTsKKyAgICBwaWNfaXJxID0gcGlpeDRfZGV2LT5jb25maWdbUElJWF9QSVJRQ0EgKyBpcnFfbnVt XTsKICAgICBpZiAocGljX2lycSA8IDE2KSB7CiAgICAgICAgIC8qIFRoZSBwaWMgbGV2ZWwgaXMg dGhlIGxvZ2ljYWwgT1Igb2YgYWxsIHRoZSBQQ0kgaXJxcyBtYXBwZWQgdG8gaXQuICovCiAgICAg ICAgIHBpY19sZXZlbCA9IDA7CiAgICAgICAgIGZvciAoaSA9IDA7IGkgPCA0OyBpKyspIHsKLSAg ICAgICAgICAgIGlmIChwaWNfaXJxID09IHBpaXg0X2Rldi0+Y29uZmlnWzB4NjAgKyBpXSkgewor ICAgICAgICAgICAgaWYgKHBpY19pcnEgPT0gcGlpeDRfZGV2LT5jb25maWdbUElJWF9QSVJRQ0Eg KyBpXSkgewogICAgICAgICAgICAgICAgIHBpY19sZXZlbCB8PSBwY2lfaXJxX2xldmVsc1tpXTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvaHcvcGNpLWhvc3QvcGlpeC5j IGIvaHcvcGNpLWhvc3QvcGlpeC5jCmluZGV4IDY1NDhkOWE0YjUuLjM5MGZiOWNlYmEgMTAwNjQ0 Ci0tLSBhL2h3L3BjaS1ob3N0L3BpaXguYworKysgYi9ody9wY2ktaG9zdC9waWl4LmMKQEAgLTYx LDcgKzYxLDYgQEAgdHlwZWRlZiBzdHJ1Y3QgSTQ0MEZYU3RhdGUgewogI2RlZmluZSBQSUlYX05V TV9QSUNfSVJRUyAgICAgICAxNiAgICAgIC8qIGk4MjU5ICogMiAqLwogI2RlZmluZSBQSUlYX05V TV9QSVJRUyAgICAgICAgICA0VUxMICAgIC8qIFBJUlFbQS1EXSAqLwogI2RlZmluZSBYRU5fUElJ WF9OVU1fUElSUVMgICAgICAxMjhVTEwKLSNkZWZpbmUgUElJWF9QSVJRQyAgICAgICAgICAgICAg MHg2MAogCiB0eXBlZGVmIHN0cnVjdCBQSUlYM1N0YXRlIHsKICAgICBQQ0lEZXZpY2UgZGV2OwpA QCAtNDY4LDcgKzQ2Nyw3IEBAIHN0YXRpYyB2b2lkIHBpaXgzX3NldF9pcnFfbGV2ZWxfaW50ZXJu YWwoUElJWDNTdGF0ZSAqcGlpeDMsIGludCBwaXJxLCBpbnQgbGV2ZWwpCiAgICAgaW50IHBpY19p cnE7CiAgICAgdWludDY0X3QgbWFzazsKIAotICAgIHBpY19pcnEgPSBwaWl4My0+ZGV2LmNvbmZp Z1tQSUlYX1BJUlFDICsgcGlycV07CisgICAgcGljX2lycSA9IHBpaXgzLT5kZXYuY29uZmlnW1BJ SVhfUElSUUNBICsgcGlycV07CiAgICAgaWYgKHBpY19pcnEgPj0gUElJWF9OVU1fUElDX0lSUVMp IHsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTQ4Miw3ICs0ODEsNyBAQCBzdGF0aWMgdm9p ZCBwaWl4M19zZXRfaXJxX2xldmVsKFBJSVgzU3RhdGUgKnBpaXgzLCBpbnQgcGlycSwgaW50IGxl dmVsKQogewogICAgIGludCBwaWNfaXJxOwogCi0gICAgcGljX2lycSA9IHBpaXgzLT5kZXYuY29u ZmlnW1BJSVhfUElSUUMgKyBwaXJxXTsKKyAgICBwaWNfaXJxID0gcGlpeDMtPmRldi5jb25maWdb UElJWF9QSVJRQ0EgKyBwaXJxXTsKICAgICBpZiAocGljX2lycSA+PSBQSUlYX05VTV9QSUNfSVJR UykgewogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNTAxLDcgKzUwMCw3IEBAIHN0YXRpYyB2 b2lkIHBpaXgzX3NldF9pcnEodm9pZCAqb3BhcXVlLCBpbnQgcGlycSwgaW50IGxldmVsKQogc3Rh dGljIFBDSUlOVHhSb3V0ZSBwaWl4M19yb3V0ZV9pbnR4X3Bpbl90b19pcnEodm9pZCAqb3BhcXVl LCBpbnQgcGluKQogewogICAgIFBJSVgzU3RhdGUgKnBpaXgzID0gb3BhcXVlOwotICAgIGludCBp cnEgPSBwaWl4My0+ZGV2LmNvbmZpZ1tQSUlYX1BJUlFDICsgcGluXTsKKyAgICBpbnQgaXJxID0g cGlpeDMtPmRldi5jb25maWdbUElJWF9QSVJRQ0EgKyBwaW5dOwogICAgIFBDSUlOVHhSb3V0ZSBy b3V0ZTsKIAogICAgIGlmIChpcnEgPCBQSUlYX05VTV9QSUNfSVJRUykgewpAQCAtNTMwLDcgKzUy OSw3IEBAIHN0YXRpYyB2b2lkIHBpaXgzX3dyaXRlX2NvbmZpZyhQQ0lEZXZpY2UgKmRldiwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBhZGRyZXNzLCB1aW50MzJfdCB2 YWwsIGludCBsZW4pCiB7CiAgICAgcGNpX2RlZmF1bHRfd3JpdGVfY29uZmlnKGRldiwgYWRkcmVz cywgdmFsLCBsZW4pOwotICAgIGlmIChyYW5nZXNfb3ZlcmxhcChhZGRyZXNzLCBsZW4sIFBJSVhf UElSUUMsIDQpKSB7CisgICAgaWYgKHJhbmdlc19vdmVybGFwKGFkZHJlc3MsIGxlbiwgUElJWF9Q SVJRQ0EsIDQpKSB7CiAgICAgICAgIFBJSVgzU3RhdGUgKnBpaXgzID0gUElJWDNfUENJX0RFVklD RShkZXYpOwogICAgICAgICBpbnQgcGljX2lycTsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody9z b3V0aGJyaWRnZS9waWl4LmggYi9pbmNsdWRlL2h3L3NvdXRoYnJpZGdlL3BpaXguaAppbmRleCBl NDlkNGE2YmJlLi4wOTQ1MDhiOTI4IDEwMDY0NAotLS0gYS9pbmNsdWRlL2h3L3NvdXRoYnJpZGdl L3BpaXguaAorKysgYi9pbmNsdWRlL2h3L3NvdXRoYnJpZGdlL3BpaXguaApAQCAtMTgsNiArMTgs MTIgQEAgSTJDQnVzICpwaWl4NF9wbV9pbml0KFBDSUJ1cyAqYnVzLCBpbnQgZGV2Zm4sIHVpbnQz Ml90IHNtYl9pb19iYXNlLAogICAgICAgICAgICAgICAgICAgICAgIHFlbXVfaXJxIHNjaV9pcnEs IHFlbXVfaXJxIHNtaV9pcnEsCiAgICAgICAgICAgICAgICAgICAgICAgaW50IHNtbV9lbmFibGVk LCBEZXZpY2VTdGF0ZSAqKnBpaXg0X3BtKTsKIAorLyogUElSUVJDW0E6RF06IFBJUlF4IFJvdXRl IENvbnRyb2wgUmVnaXN0ZXJzICovCisjZGVmaW5lIFBJSVhfUElSUUNBIDB4NjAKKyNkZWZpbmUg UElJWF9QSVJRQ0IgMHg2MQorI2RlZmluZSBQSUlYX1BJUlFDQyAweDYyCisjZGVmaW5lIFBJSVhf UElSUUNEIDB4NjMKKwogLyoKICAqIFJlc2V0IENvbnRyb2wgUmVnaXN0ZXI6IFBDSS1hY2Nlc3Np YmxlIElTQS1Db21wYXRpYmxlIFJlZ2lzdGVyIGF0IGFkZHJlc3MKICAqIDB4Y2Y5LCBwcm92aWRl ZCBieSB0aGUgUENJL0lTQSBicmlkZ2UgKFBJSVgzIFBDSSBmdW5jdGlvbiAwLCA4MDg2OjcwMDAp LgotLSAKMi4yMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5v cmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZl bA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33B40CA9EA8 for ; Fri, 18 Oct 2019 14:09:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0887721925 for ; Fri, 18 Oct 2019 14:09:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0887721925 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSwK-0002uq-5J for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 10:09:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55279) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSeV-0006I8-Rz for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:50:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLSeU-0006lU-Jt for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:50:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46198) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLSeU-0006l0-BI for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:50:46 -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 mx1.redhat.com (Postfix) with ESMTPS id 740D9302C076; Fri, 18 Oct 2019 13:50:45 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4682F60BF1; Fri, 18 Oct 2019 13:50:38 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 15/20] hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers Date: Fri, 18 Oct 2019 15:47:49 +0200 Message-Id: <20191018134754.16362-16-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 18 Oct 2019 13:50:45 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , "Michael S. Tsirkin" , Paul Durrant , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The IRQ Route Control registers definitions belong to the PIIX chipset. We were only defining the 'A' register. Define the other B, C and D registers, and use them. Acked-by: Paul Durrant Reviewed-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/xen/xen-hvm.c | 5 +++-- hw/mips/gt64xxx_pci.c | 4 ++-- hw/pci-host/piix.c | 9 ++++----- include/hw/southbridge/piix.h | 6 ++++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 6b5e5bb7f5..4ce2fb9c89 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -14,6 +14,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/i386/pc.h" +#include "hw/southbridge/piix.h" #include "hw/irq.h" #include "hw/hw.h" #include "hw/i386/apic-msidef.h" @@ -156,8 +157,8 @@ void xen_piix_pci_write_config_client(uint32_t addres= s, uint32_t val, int len) v =3D 0; } v &=3D 0xf; - if (((address + i) >=3D 0x60) && ((address + i) <=3D 0x63)) { - xen_set_pci_link_route(xen_domid, address + i - 0x60, v); + if (((address + i) >=3D PIIX_PIRQCA) && ((address + i) <=3D PIIX= _PIRQCD)) { + xen_set_pci_link_route(xen_domid, address + i - PIIX_PIRQCA,= v); } } } diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index c277398c0d..5cab9c1ee1 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -1013,12 +1013,12 @@ static void gt64120_pci_set_irq(void *opaque, int= irq_num, int level) =20 /* now we change the pic irq level according to the piix irq mapping= s */ /* XXX: optimize */ - pic_irq =3D piix4_dev->config[0x60 + irq_num]; + pic_irq =3D piix4_dev->config[PIIX_PIRQCA + irq_num]; if (pic_irq < 16) { /* The pic level is the logical OR of all the PCI irqs mapped to= it. */ pic_level =3D 0; for (i =3D 0; i < 4; i++) { - if (pic_irq =3D=3D piix4_dev->config[0x60 + i]) { + if (pic_irq =3D=3D piix4_dev->config[PIIX_PIRQCA + i]) { pic_level |=3D pci_irq_levels[i]; } } diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 6548d9a4b5..390fb9ceba 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -61,7 +61,6 @@ typedef struct I440FXState { #define PIIX_NUM_PIC_IRQS 16 /* i8259 * 2 */ #define PIIX_NUM_PIRQS 4ULL /* PIRQ[A-D] */ #define XEN_PIIX_NUM_PIRQS 128ULL -#define PIIX_PIRQC 0x60 =20 typedef struct PIIX3State { PCIDevice dev; @@ -468,7 +467,7 @@ static void piix3_set_irq_level_internal(PIIX3State *= piix3, int pirq, int level) int pic_irq; uint64_t mask; =20 - pic_irq =3D piix3->dev.config[PIIX_PIRQC + pirq]; + pic_irq =3D piix3->dev.config[PIIX_PIRQCA + pirq]; if (pic_irq >=3D PIIX_NUM_PIC_IRQS) { return; } @@ -482,7 +481,7 @@ static void piix3_set_irq_level(PIIX3State *piix3, in= t pirq, int level) { int pic_irq; =20 - pic_irq =3D piix3->dev.config[PIIX_PIRQC + pirq]; + pic_irq =3D piix3->dev.config[PIIX_PIRQCA + pirq]; if (pic_irq >=3D PIIX_NUM_PIC_IRQS) { return; } @@ -501,7 +500,7 @@ static void piix3_set_irq(void *opaque, int pirq, int= level) static PCIINTxRoute piix3_route_intx_pin_to_irq(void *opaque, int pin) { PIIX3State *piix3 =3D opaque; - int irq =3D piix3->dev.config[PIIX_PIRQC + pin]; + int irq =3D piix3->dev.config[PIIX_PIRQCA + pin]; PCIINTxRoute route; =20 if (irq < PIIX_NUM_PIC_IRQS) { @@ -530,7 +529,7 @@ static void piix3_write_config(PCIDevice *dev, uint32_t address, uint32_t val, int len) { pci_default_write_config(dev, address, val, len); - if (ranges_overlap(address, len, PIIX_PIRQC, 4)) { + if (ranges_overlap(address, len, PIIX_PIRQCA, 4)) { PIIX3State *piix3 =3D PIIX3_PCI_DEVICE(dev); int pic_irq; =20 diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.= h index e49d4a6bbe..094508b928 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -18,6 +18,12 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t= smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, int smm_enabled, DeviceState **piix4_pm); =20 +/* PIRQRC[A:D]: PIRQx Route Control Registers */ +#define PIIX_PIRQCA 0x60 +#define PIIX_PIRQCB 0x61 +#define PIIX_PIRQCC 0x62 +#define PIIX_PIRQCD 0x63 + /* * Reset Control Register: PCI-accessible ISA-Compatible Register at add= ress * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:700= 0). --=20 2.21.0