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 D9FD1ECE588 for ; Tue, 15 Oct 2019 16:32:54 +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 B7B5E2086A for ; Tue, 15 Oct 2019 16:32:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B7B5E2086A 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 1iKPkb-00061d-Jh; Tue, 15 Oct 2019 16:32:45 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPkb-00061J-3y for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:32:45 +0000 X-Inumbo-ID: 6983a6ab-ef69-11e9-9397-12813bfff9fa Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6983a6ab-ef69-11e9-9397-12813bfff9fa; Tue, 15 Oct 2019 16:32:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 139E73090FF4; Tue, 15 Oct 2019 16:32:44 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9CBAB451D; Tue, 15 Oct 2019 16:32:26 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:27:00 +0200 Message-Id: <20191015162705.28087-28-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 16:32:44 +0000 (UTC) Subject: [Xen-devel] [PATCH 27/32] 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: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" VGhlIElSUSBSb3V0ZSBDb250cm9sIHJlZ2lzdGVycyBkZWZpbml0aW9ucyBiZWxvbmcgdG8gdGhl IFBJSVgKY2hpcHNldC4gV2Ugd2VyZSBvbmx5IGRlZmluaW5nIHRoZSAnQScgcmVnaXN0ZXIuIERl ZmluZSB0aGUgb3RoZXIKQiwgQyBhbmQgRCByZWdpc3RlcnMsIGFuZCB1c2UgdGhlbS4KClNpZ25l ZC1vZmYtYnk6IFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KLS0t CiBody9pMzg2L3hlbi94ZW4taHZtLmMgICAgICAgICB8IDUgKysrLS0KIGh3L21pcHMvZ3Q2NHh4 eF9wY2kuYyAgICAgICAgIHwgNCArKy0tCiBody9wY2ktaG9zdC9waWl4LmMgICAgICAgICAgICB8 IDkgKysrKy0tLS0tCiBpbmNsdWRlL2h3L3NvdXRoYnJpZGdlL3BpaXguaCB8IDYgKysrKysrCiA0 IGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvaHcvaTM4Ni94ZW4veGVuLWh2bS5jIGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCmluZGV4 IDZiNWU1YmI3ZjUuLjRjZTJmYjljODkgMTAwNjQ0Ci0tLSBhL2h3L2kzODYveGVuL3hlbi1odm0u YworKysgYi9ody9pMzg2L3hlbi94ZW4taHZtLmMKQEAgLTE0LDYgKzE0LDcgQEAKICNpbmNsdWRl ICJody9wY2kvcGNpLmgiCiAjaW5jbHVkZSAiaHcvcGNpL3BjaV9ob3N0LmgiCiAjaW5jbHVkZSAi aHcvaTM4Ni9wYy5oIgorI2luY2x1ZGUgImh3L3NvdXRoYnJpZGdlL3BpaXguaCIKICNpbmNsdWRl ICJody9pcnEuaCIKICNpbmNsdWRlICJody9ody5oIgogI2luY2x1ZGUgImh3L2kzODYvYXBpYy1t c2lkZWYuaCIKQEAgLTE1Niw4ICsxNTcsOCBAQCB2b2lkIHhlbl9waWl4X3BjaV93cml0ZV9jb25m aWdfY2xpZW50KHVpbnQzMl90IGFkZHJlc3MsIHVpbnQzMl90IHZhbCwgaW50IGxlbikKICAgICAg ICAgICAgIHYgPSAwOwogICAgICAgICB9CiAgICAgICAgIHYgJj0gMHhmOwotICAgICAgICBpZiAo KChhZGRyZXNzICsgaSkgPj0gMHg2MCkgJiYgKChhZGRyZXNzICsgaSkgPD0gMHg2MykpIHsKLSAg ICAgICAgICAgIHhlbl9zZXRfcGNpX2xpbmtfcm91dGUoeGVuX2RvbWlkLCBhZGRyZXNzICsgaSAt IDB4NjAsIHYpOworICAgICAgICBpZiAoKChhZGRyZXNzICsgaSkgPj0gUElJWF9QSVJRQ0EpICYm ICgoYWRkcmVzcyArIGkpIDw9IFBJSVhfUElSUUNEKSkgeworICAgICAgICAgICAgeGVuX3NldF9w Y2lfbGlua19yb3V0ZSh4ZW5fZG9taWQsIGFkZHJlc3MgKyBpIC0gUElJWF9QSVJRQ0EsIHYpOwog ICAgICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvaHcvbWlwcy9ndDY0eHh4X3BjaS5jIGIv aHcvbWlwcy9ndDY0eHh4X3BjaS5jCmluZGV4IGMyNzczOThjMGQuLjVjYWI5YzFlZTEgMTAwNjQ0 Ci0tLSBhL2h3L21pcHMvZ3Q2NHh4eF9wY2kuYworKysgYi9ody9taXBzL2d0NjR4eHhfcGNpLmMK QEAgLTEwMTMsMTIgKzEwMTMsMTIgQEAgc3RhdGljIHZvaWQgZ3Q2NDEyMF9wY2lfc2V0X2lycSh2 b2lkICpvcGFxdWUsIGludCBpcnFfbnVtLCBpbnQgbGV2ZWwpCiAKICAgICAvKiBub3cgd2UgY2hh bmdlIHRoZSBwaWMgaXJxIGxldmVsIGFjY29yZGluZyB0byB0aGUgcGlpeCBpcnEgbWFwcGluZ3Mg Ki8KICAgICAvKiBYWFg6IG9wdGltaXplICovCi0gICAgcGljX2lycSA9IHBpaXg0X2Rldi0+Y29u ZmlnWzB4NjAgKyBpcnFfbnVtXTsKKyAgICBwaWNfaXJxID0gcGlpeDRfZGV2LT5jb25maWdbUElJ WF9QSVJRQ0EgKyBpcnFfbnVtXTsKICAgICBpZiAocGljX2lycSA8IDE2KSB7CiAgICAgICAgIC8q IFRoZSBwaWMgbGV2ZWwgaXMgdGhlIGxvZ2ljYWwgT1Igb2YgYWxsIHRoZSBQQ0kgaXJxcyBtYXBw ZWQgdG8gaXQuICovCiAgICAgICAgIHBpY19sZXZlbCA9IDA7CiAgICAgICAgIGZvciAoaSA9IDA7 IGkgPCA0OyBpKyspIHsKLSAgICAgICAgICAgIGlmIChwaWNfaXJxID09IHBpaXg0X2Rldi0+Y29u ZmlnWzB4NjAgKyBpXSkgeworICAgICAgICAgICAgaWYgKHBpY19pcnEgPT0gcGlpeDRfZGV2LT5j b25maWdbUElJWF9QSVJRQ0EgKyBpXSkgewogICAgICAgICAgICAgICAgIHBpY19sZXZlbCB8PSBw Y2lfaXJxX2xldmVsc1tpXTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpkaWZmIC0tZ2l0IGEv aHcvcGNpLWhvc3QvcGlpeC5jIGIvaHcvcGNpLWhvc3QvcGlpeC5jCmluZGV4IDM3NzA1NzVjMWEu LmE0NTBmYzcyNmUgMTAwNjQ0Ci0tLSBhL2h3L3BjaS1ob3N0L3BpaXguYworKysgYi9ody9wY2kt aG9zdC9waWl4LmMKQEAgLTYxLDcgKzYxLDYgQEAgdHlwZWRlZiBzdHJ1Y3QgSTQ0MEZYU3RhdGUg ewogI2RlZmluZSBQSUlYX05VTV9QSUNfSVJRUyAgICAgICAxNiAgICAgIC8qIGk4MjU5ICogMiAq LwogI2RlZmluZSBQSUlYX05VTV9QSVJRUyAgICAgICAgICA0VUxMICAgIC8qIFBJUlFbQS1EXSAq LwogI2RlZmluZSBYRU5fUElJWF9OVU1fUElSUVMgICAgICAxMjhVTEwKLSNkZWZpbmUgUElJWF9Q SVJRQyAgICAgICAgICAgICAgMHg2MAogCiB0eXBlZGVmIHN0cnVjdCBQSUlYM1N0YXRlIHsKICAg ICBQQ0lEZXZpY2UgZGV2OwpAQCAtNDY4LDcgKzQ2Nyw3IEBAIHN0YXRpYyB2b2lkIHBpaXgzX3Nl dF9pcnFfbGV2ZWxfaW50ZXJuYWwoUElJWDNTdGF0ZSAqcGlpeDMsIGludCBwaXJxLCBpbnQgbGV2 ZWwpCiAgICAgaW50IHBpY19pcnE7CiAgICAgdWludDY0X3QgbWFzazsKIAotICAgIHBpY19pcnEg PSBwaWl4My0+ZGV2LmNvbmZpZ1tQSUlYX1BJUlFDICsgcGlycV07CisgICAgcGljX2lycSA9IHBp aXgzLT5kZXYuY29uZmlnW1BJSVhfUElSUUNBICsgcGlycV07CiAgICAgaWYgKHBpY19pcnEgPj0g UElJWF9OVU1fUElDX0lSUVMpIHsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTQ4Miw3ICs0 ODEsNyBAQCBzdGF0aWMgdm9pZCBwaWl4M19zZXRfaXJxX2xldmVsKFBJSVgzU3RhdGUgKnBpaXgz LCBpbnQgcGlycSwgaW50IGxldmVsKQogewogICAgIGludCBwaWNfaXJxOwogCi0gICAgcGljX2ly cSA9IHBpaXgzLT5kZXYuY29uZmlnW1BJSVhfUElSUUMgKyBwaXJxXTsKKyAgICBwaWNfaXJxID0g cGlpeDMtPmRldi5jb25maWdbUElJWF9QSVJRQ0EgKyBwaXJxXTsKICAgICBpZiAocGljX2lycSA+ PSBQSUlYX05VTV9QSUNfSVJRUykgewogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNTAxLDcg KzUwMCw3IEBAIHN0YXRpYyB2b2lkIHBpaXgzX3NldF9pcnEodm9pZCAqb3BhcXVlLCBpbnQgcGly cSwgaW50IGxldmVsKQogc3RhdGljIFBDSUlOVHhSb3V0ZSBwaWl4M19yb3V0ZV9pbnR4X3Bpbl90 b19pcnEodm9pZCAqb3BhcXVlLCBpbnQgcGluKQogewogICAgIFBJSVgzU3RhdGUgKnBpaXgzID0g b3BhcXVlOwotICAgIGludCBpcnEgPSBwaWl4My0+ZGV2LmNvbmZpZ1tQSUlYX1BJUlFDICsgcGlu XTsKKyAgICBpbnQgaXJxID0gcGlpeDMtPmRldi5jb25maWdbUElJWF9QSVJRQ0EgKyBwaW5dOwog ICAgIFBDSUlOVHhSb3V0ZSByb3V0ZTsKIAogICAgIGlmIChpcnEgPCBQSUlYX05VTV9QSUNfSVJR UykgewpAQCAtNTMwLDcgKzUyOSw3IEBAIHN0YXRpYyB2b2lkIHBpaXgzX3dyaXRlX2NvbmZpZyhQ Q0lEZXZpY2UgKmRldiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBh ZGRyZXNzLCB1aW50MzJfdCB2YWwsIGludCBsZW4pCiB7CiAgICAgcGNpX2RlZmF1bHRfd3JpdGVf Y29uZmlnKGRldiwgYWRkcmVzcywgdmFsLCBsZW4pOwotICAgIGlmIChyYW5nZXNfb3ZlcmxhcChh ZGRyZXNzLCBsZW4sIFBJSVhfUElSUUMsIDQpKSB7CisgICAgaWYgKHJhbmdlc19vdmVybGFwKGFk ZHJlc3MsIGxlbiwgUElJWF9QSVJRQ0EsIDQpKSB7CiAgICAgICAgIFBJSVgzU3RhdGUgKnBpaXgz ID0gUElJWDNfUENJX0RFVklDRShkZXYpOwogICAgICAgICBpbnQgcGljX2lycTsKIApkaWZmIC0t Z2l0IGEvaW5jbHVkZS9ody9zb3V0aGJyaWRnZS9waWl4LmggYi9pbmNsdWRlL2h3L3NvdXRoYnJp ZGdlL3BpaXguaAppbmRleCA3OWViZTAwODliLi45YzkyYzM3YTRkIDEwMDY0NAotLS0gYS9pbmNs dWRlL2h3L3NvdXRoYnJpZGdlL3BpaXguaAorKysgYi9pbmNsdWRlL2h3L3NvdXRoYnJpZGdlL3Bp aXguaApAQCAtMTgsNiArMTgsMTIgQEAgSTJDQnVzICpwaWl4NF9wbV9pbml0KFBDSUJ1cyAqYnVz LCBpbnQgZGV2Zm4sIHVpbnQzMl90IHNtYl9pb19iYXNlLAogICAgICAgICAgICAgICAgICAgICAg IHFlbXVfaXJxIHNjaV9pcnEsIHFlbXVfaXJxIHNtaV9pcnEsCiAgICAgICAgICAgICAgICAgICAg ICAgaW50IHNtbV9lbmFibGVkLCBEZXZpY2VTdGF0ZSAqKnBpaXg0X3BtKTsKIAorLyogUElSUVJD W0E6RF06IFBJUlF4IFJvdXRlIENvbnRyb2wgUmVnaXN0ZXJzICovCisjZGVmaW5lIFBJSVhfUElS UUNBIDB4NjAKKyNkZWZpbmUgUElJWF9QSVJRQ0IgMHg2MQorI2RlZmluZSBQSUlYX1BJUlFDQyAw eDYyCisjZGVmaW5lIFBJSVhfUElSUUNEIDB4NjMKKwogLyoKICAqIFJlc2V0IENvbnRyb2wgUmVn aXN0ZXI6IFBDSS1hY2Nlc3NpYmxlIElTQS1Db21wYXRpYmxlIFJlZ2lzdGVyIGF0IGFkZHJlc3MK ICAqIDB4Y2Y5LCBwcm92aWRlZCBieSB0aGUgUENJL0lTQSBicmlkZ2UgKFBJSVgzIFBDSSBmdW5j dGlvbiAwLCA4MDg2OjcwMDApLgotLSAKMi4yMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxA bGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFu L2xpc3RpbmZvL3hlbi1kZXZlbA== 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 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 41839ECE588 for ; Tue, 15 Oct 2019 16:32:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E6B12086A for ; Tue, 15 Oct 2019 16:32:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388146AbfJOQcp (ORCPT ); Tue, 15 Oct 2019 12:32:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60733 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728692AbfJOQcp (ORCPT ); Tue, 15 Oct 2019 12:32:45 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 139E73090FF4; Tue, 15 Oct 2019 16:32:44 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9CBAB451D; Tue, 15 Oct 2019 16:32:26 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Markovic , Aurelien Jarno , Eduardo Habkost , Thomas Huth , Igor Mammedov , Anthony Perard , Stefano Stabellini , Paul Durrant , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Rikalo , xen-devel@lists.xenproject.org, Laurent Vivier , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 27/32] hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers Date: Tue, 15 Oct 2019 18:27:00 +0200 Message-Id: <20191015162705.28087-28-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 16:32:44 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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. Signed-off-by: Philippe Mathieu-Daudé --- 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 address, uint32_t val, int len) v = 0; } v &= 0xf; - if (((address + i) >= 0x60) && ((address + i) <= 0x63)) { - xen_set_pci_link_route(xen_domid, address + i - 0x60, v); + if (((address + i) >= PIIX_PIRQCA) && ((address + i) <= 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) /* now we change the pic irq level according to the piix irq mappings */ /* XXX: optimize */ - pic_irq = piix4_dev->config[0x60 + irq_num]; + pic_irq = 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 = 0; for (i = 0; i < 4; i++) { - if (pic_irq == piix4_dev->config[0x60 + i]) { + if (pic_irq == piix4_dev->config[PIIX_PIRQCA + i]) { pic_level |= pci_irq_levels[i]; } } diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 3770575c1a..a450fc726e 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 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; - pic_irq = piix3->dev.config[PIIX_PIRQC + pirq]; + pic_irq = piix3->dev.config[PIIX_PIRQCA + pirq]; if (pic_irq >= PIIX_NUM_PIC_IRQS) { return; } @@ -482,7 +481,7 @@ static void piix3_set_irq_level(PIIX3State *piix3, int pirq, int level) { int pic_irq; - pic_irq = piix3->dev.config[PIIX_PIRQC + pirq]; + pic_irq = piix3->dev.config[PIIX_PIRQCA + pirq]; if (pic_irq >= 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 = opaque; - int irq = piix3->dev.config[PIIX_PIRQC + pin]; + int irq = piix3->dev.config[PIIX_PIRQCA + pin]; PCIINTxRoute route; 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 = PIIX3_PCI_DEVICE(dev); int pic_irq; diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h index 79ebe0089b..9c92c37a4d 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); +/* 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 address * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:7000). -- 2.21.0 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 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 E0CA9C10F14 for ; Tue, 15 Oct 2019 16:45:00 +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 B201D20650 for ; Tue, 15 Oct 2019 16:45:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B201D20650 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]:52880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPwR-0003i5-El for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:44:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42036) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPkc-0004xx-MN for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:32:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPkb-0007Ig-Aq for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:32:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58880) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPkb-0007I7-1q for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:32:45 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 139E73090FF4; Tue, 15 Oct 2019 16:32:44 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9CBAB451D; Tue, 15 Oct 2019 16:32:26 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 27/32] hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers Date: Tue, 15 Oct 2019 18:27:00 +0200 Message-Id: <20191015162705.28087-28-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 16:32:44 +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: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson 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. 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 3770575c1a..a450fc726e 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 79ebe0089b..9c92c37a4d 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