From nobody Thu May 16 17:48:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1555378965; cv=none; d=zoho.com; s=zohoarc; b=V7MvaOhPPB0FrkkAgQqSofA8TC7bz74p4od9rX6FAa7UB33+0Ddl/xlQpl3iPW5aoveOIK8l9wZqbcI+lGMhlKWtlckF/y4ecXQaNpXyl76Bf7YWF0waGTI2Em2ooAx5l2V/hZiZxbgb4eZ8EwAu8MjdudE1SBPUEQ3+B+jQs6o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555378965; h=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:ARC-Authentication-Results; bh=mAOovaqXC3eW8KbfZy9zueBheQL2BmRbn3rOTUCb8bM=; b=EVn7kS8pFxHkFgbz70KZYQWKck+J4YMnk8o/j/c2ERoEMLqHrif/7vSSAfM4fUSJAK1Z53xjF89V3pVTPfru1UvtRQ/vffwzX7S2rtd0Igd9fTcy4Ckx5roQRqc3OmIMpK3ZSygCdN1qR3DTlkQdSloKjOA3ukkBBYoxciZ7tzc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555378965841114.7541574385117; Mon, 15 Apr 2019 18:42:45 -0700 (PDT) Received: from localhost ([127.0.0.1]:57836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGD7S-0008UR-U9 for importer@patchew.org; Mon, 15 Apr 2019 21:42:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGD4R-0006Rx-DI for qemu-devel@nongnu.org; Mon, 15 Apr 2019 21:39:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGD4Q-0007nt-F7 for qemu-devel@nongnu.org; Mon, 15 Apr 2019 21:39:35 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:41511) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGD4O-0007lw-8r; Mon, 15 Apr 2019 21:39:32 -0400 Received: by mail-pf1-x429.google.com with SMTP id 188so9522595pfd.8; Mon, 15 Apr 2019 18:39:31 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id v20sm74710362pfn.116.2019.04.15.18.39.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 18:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mAOovaqXC3eW8KbfZy9zueBheQL2BmRbn3rOTUCb8bM=; b=B0Uvp4MHidxmn1CzZFKEJJmu4P3IKq9j7g4bQ9NfDvTQGhTH/jPqfshiIeaeUX9Vkx +QsC1YuvANTEV8L68r/KYog2U++BHuwDBlNzIkB50aAsegzF5UGtYZU+Ocr8QY8EF9My ju7UujWCCbmteXtaLN7uNyZVSz90lkoX5gIaYm4vqhQI39W5A+MovgQQzqKZQksIKaaq KundtRgSryWIwDH7nz67YtbdWLiAiziW7axYA0pU4R5v4AC8Z6ZCG0Jd8Vpqs0ijsrkt PdhanK/zVwCEMnBdyyVDnJcvu+cL4hjaW1KqSO8gbNKKvWGosvGEn8OXi6R+34Dlj0Ra OjYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mAOovaqXC3eW8KbfZy9zueBheQL2BmRbn3rOTUCb8bM=; b=fzypunVzdEtdm+atPWpy+Tpacz3xLntmU6zdkvq9vRrReBjc+vGIo94AJlSDH9ASlH uGSCk4f+z3L0SzbRlR6tFlY7mJs4inRfyVB4ZNLZjYnRpZZJeIg87dsqcUcjXk4drrj7 72Gby5YmZzoGwhl+FYub1v9rfYK71kqO5qv9VDFMqbLWgO6DnHluZZizb/BMf2A/RqnY /sBbyN8rG8vHOYTzKUZZu8M8lfAhdgsH9FwxsoxAxVaefTII4X1ldEhMNYLl2IvzSUus qfzX/iEDiQB3NVD6cTwEEP4uF6KzDrWnJpaE7kimm5ffQlJh63v4rGbZ7miUJNMQRiwN 9VWg== X-Gm-Message-State: APjAAAVs6UlmGu4A7XRxbdmDSDNOxrGMe28g1ZekY/o/ao4K/dVcwBpE R2kgWtCxkooFph1VEnPZZ8jClw7S X-Google-Smtp-Source: APXvYqxGQ5MeveRCKpiggKVn95hjJ5QhRSTQmnigJQZEKd7EX1rz0BxywhIlXXPWzwu4ST2vnThQKA== X-Received: by 2002:a63:115c:: with SMTP id 28mr44654575pgr.270.1555378770144; Mon, 15 Apr 2019 18:39:30 -0700 (PDT) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 15 Apr 2019 18:38:58 -0700 Message-Id: <20190416013902.4941-2-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190416013902.4941-1-andrew.smirnov@gmail.com> References: <20190416013902.4941-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::429 Subject: [Qemu-devel] [PATCH 1/5] i.mx7d: Add no-op/unimplemented APBH DMA module X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , Peter Maydell , qemu-devel@nongnu.org, "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Instantiate no-op APBH DMA module. Needed to boot latest Linux kernel. Signed-off-by: Andrey Smirnov Cc: Peter Maydell Cc: Michael S. Tsirkin Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org --- include/hw/arm/fsl-imx7.h | 3 +++ hw/arm/fsl-imx7.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index d848262bfd..aae4f860fc 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -179,6 +179,9 @@ enum FslIMX7MemoryMap { FSL_IMX7_PCIE_REG_SIZE =3D 16 * 1024, =20 FSL_IMX7_GPR_ADDR =3D 0x30340000, + + FSL_IMX7_DMA_APBH_ADDR =3D 0x33000000, + FSL_IMX7_DMA_APBH_SIZE =3D 0x2000, }; =20 enum FslIMX7IRQs { diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c index 7663ad6861..1abfa5910c 100644 --- a/hw/arm/fsl-imx7.c +++ b/hw/arm/fsl-imx7.c @@ -526,6 +526,12 @@ static void fsl_imx7_realize(DeviceState *dev, Error *= *errp) */ create_unimplemented_device("lcdif", FSL_IMX7_LCDIF_ADDR, FSL_IMX7_LCDIF_SIZE); + + /* + * DMA APBH + */ + create_unimplemented_device("dma-apbh", FSL_IMX7_DMA_APBH_ADDR, + FSL_IMX7_DMA_APBH_SIZE); } =20 static void fsl_imx7_class_init(ObjectClass *oc, void *data) --=20 2.20.1 From nobody Thu May 16 17:48:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1555379033; cv=none; d=zoho.com; s=zohoarc; b=KCJfbz7cCXFHlfo1ox8IbQIXPEkuG6ADu4dPTsJ/FFcMokiLQEJ9s4WO6PE8bhHannMoJXgEBOnOesZxIHyBwCQcsPcFuFQTkFWgn6wYgC+S9cBS7HduQiJNC7EwCt0M28rg2ZzUGyfmosXLjquO6Kczha/1tvgc2j0gQbzIEXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555379033; h=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:ARC-Authentication-Results; bh=apAWNpdsoKze6QgfaW5xAIkNAJRGaK2WIkM9N7G5qZw=; b=aFGbDwulYcstDqyGX/4xWuUIwkttXcjJtH7OD3y53PqY3hyncDCvddOmZVdgwMDSBmkUiKPNh7U2I10zQuOi+oGL5kd9esJ9whmZ68XXoa818tvLYtDDZNiGoBgAwVa99PyEOtmFhM8c8Isb7SLm6wM2qeyL+Ju79G6pgjopAWg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155537903371648.21030606339957; Mon, 15 Apr 2019 18:43:53 -0700 (PDT) Received: from localhost ([127.0.0.1]:57842 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGD8X-0000ff-RG for importer@patchew.org; Mon, 15 Apr 2019 21:43:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGD4R-0006SC-M3 for qemu-devel@nongnu.org; Mon, 15 Apr 2019 21:39:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGD4Q-0007o3-Oy for qemu-devel@nongnu.org; Mon, 15 Apr 2019 21:39:35 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:38635) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGD4O-0007mL-HX; Mon, 15 Apr 2019 21:39:32 -0400 Received: by mail-pl1-x62f.google.com with SMTP id f36so9478408plb.5; Mon, 15 Apr 2019 18:39:32 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id v20sm74710362pfn.116.2019.04.15.18.39.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 18:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=apAWNpdsoKze6QgfaW5xAIkNAJRGaK2WIkM9N7G5qZw=; b=pHhsinVGlxUPde6+a7KgisNBWZZ09bGNeGC+YxR0cW+cIVs7xj6aKMPlTWFxFmtuWo euItAaFr8oocO7F4b5Jej5GXdwL1+ustQiaksZiImt/Hb+spGrcBzd8cI25tEiY/Vulf 9vFMAIS41eHb9WeZlHLNbOrUiOlmohd0ly1fASvjO+Nm8KT1tE/OTXxWE5ijuXaaM15n bj3VxkbwKiNDXObrTW48s2/s0pmtvr2vSCK628dsAX4afdJXWUqnERYHJ4dLQg/CiKRC OiraUz0sW4k5gPoW7vP6K6lvBQEji8CUzl+MdwKozIF77eKae2V3JobcRqtqYXyRABHX Ck1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=apAWNpdsoKze6QgfaW5xAIkNAJRGaK2WIkM9N7G5qZw=; b=bD0o6AGx6Wpy1PtVHsW2KPnicHOdTjAM/t8gd72T+QKMhCd2ETdhInSeYGXjo5+DwQ 6H4DPTj2j3WX14UGCigHh+Cv4HJtRhDrkF0BVWfRvfCXO9UoVep7LbMKqy/T8Cnaf/mo kkYJm7wTJ13DQl6vIcu/ggrxoqsaTAIAGds7/u/S5+hYOemoJjvFQ8S6O7cgQr4vZOrq 6L9gtjhp4EUywcC65wsgBoYqmN7VoM9qmvqXcE6wRO6Q34UBEool/xBophKNEDHxrO4P XR3ZmBlMBxHTt1LOmgVIvEW9TMc4H+n7aQ4hFXbNDni8n6Hu3BXlkLdvWdZyntWlmYY0 IsMA== X-Gm-Message-State: APjAAAVKMJpF67ou9qYendA9ly5u9iYq9giUKdKfnX+ykyWhs6gr9AcL 9dd3ZCjpAOJa7tvNN74cdqRwGMcC X-Google-Smtp-Source: APXvYqzaV9QHFAJXO6kpH23qZFmWuGoLzesrD0Nbjia1vI1hj2CQ5fOQXah7bp1CJLnXogXcZUPopA== X-Received: by 2002:a17:902:2e83:: with SMTP id r3mr78978640plb.153.1555378771333; Mon, 15 Apr 2019 18:39:31 -0700 (PDT) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 15 Apr 2019 18:38:59 -0700 Message-Id: <20190416013902.4941-3-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190416013902.4941-1-andrew.smirnov@gmail.com> References: <20190416013902.4941-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62f Subject: [Qemu-devel] [PATCH 2/5] i.mx7d: Add no-op/unimplemented PCIE PHY IP block X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , Peter Maydell , qemu-devel@nongnu.org, "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add no-op/unimplemented PCIE PHY IP block. Needed by new kernels to use PCIE. Signed-off-by: Andrey Smirnov Cc: Peter Maydell Cc: Michael S. Tsirkin Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/fsl-imx7.h | 3 +++ hw/arm/fsl-imx7.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index aae4f860fc..3efa697adc 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -125,6 +125,9 @@ enum FslIMX7MemoryMap { FSL_IMX7_ADC2_ADDR =3D 0x30620000, FSL_IMX7_ADCn_SIZE =3D 0x1000, =20 + FSL_IMX7_PCIE_PHY_ADDR =3D 0x306D0000, + FSL_IMX7_PCIE_PHY_SIZE =3D 0x10000, + FSL_IMX7_GPC_ADDR =3D 0x303A0000, =20 FSL_IMX7_I2C1_ADDR =3D 0x30A20000, diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c index 1abfa5910c..813fb55ca9 100644 --- a/hw/arm/fsl-imx7.c +++ b/hw/arm/fsl-imx7.c @@ -532,6 +532,11 @@ static void fsl_imx7_realize(DeviceState *dev, Error *= *errp) */ create_unimplemented_device("dma-apbh", FSL_IMX7_DMA_APBH_ADDR, FSL_IMX7_DMA_APBH_SIZE); + /* + * PCIe PHY + */ + create_unimplemented_device("pcie-phy", FSL_IMX7_PCIE_PHY_ADDR, + FSL_IMX7_PCIE_PHY_SIZE); } =20 static void fsl_imx7_class_init(ObjectClass *oc, void *data) --=20 2.20.1 From nobody Thu May 16 17:48:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1555379094; cv=none; d=zoho.com; s=zohoarc; b=MzFZT4L3QabbWbCy3HNyJFLAtgTrGTKlFnjjr26zgo3bqfQnoSedeAuML7slUx4mMfip4DC6MO60oRvzbcOSoJ+uKWTHJS5QQDu6v9zsPBpYk4yh6cJq0C7Qb0RShRlg1kkXDWaYczIOJ1EizN+IFfOgTlrsLhGxSVyY0OuLFz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555379094; h=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:ARC-Authentication-Results; bh=HyeSXtTi0HQGgMHm9SM0E/AgTMzg6uy5FrM4vtsvYjI=; b=fUxUIdmF6Z2bKQBHMqFPpf/9+xiGxOY3baLQapLc//jTJ+2qLIwo5nT6C6Rkf/tepzRmRMJtPCkUFSxJ/7QzblAgFpsl2Y88CudK8L0MuKu/2Aq2P0IacGxElnJXMcGn6MJtBWugI1lXdKr7AccDs79zIx3GogLFaVH6LVrdu5o= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555379094776778.0729208668496; Mon, 15 Apr 2019 18:44:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:57849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGD9Z-0001I4-Sh for importer@patchew.org; Mon, 15 Apr 2019 21:44:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGD4T-0006U1-3F for qemu-devel@nongnu.org; Mon, 15 Apr 2019 21:39:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGD4S-0007p5-4V for qemu-devel@nongnu.org; Mon, 15 Apr 2019 21:39:37 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:36822) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGD4P-0007nC-RT; Mon, 15 Apr 2019 21:39:34 -0400 Received: by mail-pl1-x643.google.com with SMTP id ck15so9490824plb.3; Mon, 15 Apr 2019 18:39:33 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id v20sm74710362pfn.116.2019.04.15.18.39.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 18:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HyeSXtTi0HQGgMHm9SM0E/AgTMzg6uy5FrM4vtsvYjI=; b=kryYvyWFlB1f7D/S0hTTm2TKpmJ0zAdUcYaou7GfWqVAs+0iSZGdI/c+2FMlqUkvLK NDRC7Z38xvI03qLCseG6Sk1GMDJiKpiwh4eD70NONO5VdIPQ2j7PzzwOgz2neVCc0nff rLbj/XcvWN4ZrNH3tmofXTLpGC7bYKPhvr2Yup2s11iukEzWrcAKcfxiXc8UT97LVfUx f/gzuBo7kJy+IklAv3jDK0qFlnCOb0WlNiRSBbgBOw7lalBUIZVFJqP7DQnmHU06CPoU /GqC3O0yoppDgluXmiT6k7C5dbhhmyC9v3MqXVHmx+ebz+XfIGib8KD4epIgqXpha0ST F72A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HyeSXtTi0HQGgMHm9SM0E/AgTMzg6uy5FrM4vtsvYjI=; b=hyKdJHd9TUAmHyAZsDD+B6ohUWJY1Gyry3WcQk1SCoWEvPD56GWoHc4mKShZtmcUDs p2eCHziHbqa4z1K0fb3VlgiULS6gQMrzg8be8l822EN57CHVuXtiRvaDPW0OuPCSPg6L rNMSbG5dXTClpBdK5ww8QGyeKAkhRahMJZxNo25UopmpgSVwdlBxlmaTO05n3XmbmNoL ribqIO3inENvuPSjN4X/aTliL5ferGc93IhSvRH1iqWKYo0vTLJ/4VkLw0rwqT58/pCa H89H5CI+81Gc/3iD1ch9dvwS+pS9C9caa72vKmPCsDz4ukSPspoRuNX4Gyn8w8i79GZu 8R/A== X-Gm-Message-State: APjAAAWRQb1W45OQ7FsYXC1iIQ58jjq71jJq0X71LyY+gOrwHM9eJViY 9i4pFBRlsNGuY16buCdKNwxrVy4x X-Google-Smtp-Source: APXvYqzqNvGx7U0By9/TNQnOLn5AJOsA62uB5OFhsKoWIscy9BcpVOKniv+wQ6iZihJnljq2X5YmBQ== X-Received: by 2002:a17:902:1124:: with SMTP id d33mr55345928pla.268.1555378772610; Mon, 15 Apr 2019 18:39:32 -0700 (PDT) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 15 Apr 2019 18:39:00 -0700 Message-Id: <20190416013902.4941-4-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190416013902.4941-1-andrew.smirnov@gmail.com> References: <20190416013902.4941-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::643 Subject: [Qemu-devel] [PATCH 3/5] pci: designware: Update MSI mapping unconditionally X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , Peter Maydell , qemu-devel@nongnu.org, "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Expression to calculate update_msi_mapping in code handling writes to DESIGNWARE_PCIE_MSI_INTR0_ENABLE is missing an ! operator and should be: !!root->msi.intr[0].enable ^ !!val; so that MSI mapping is updated when enabled transitions from either "none" -> "any" or "any" -> "none". Since that register shouldn't be written to very often, change the code to update MSI mapping unconditionally instead of trying to fix the update_msi_mapping logic. Signed-off-by: Andrey Smirnov Cc: Peter Maydell Cc: Michael S. Tsirkin Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Acked-by: Michael S. Tsirkin Reviewed-by: Peter Maydell --- hw/pci-host/designware.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index 29ea313798..6affe823c0 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -296,16 +296,10 @@ static void designware_pcie_root_config_write(PCIDevi= ce *d, uint32_t address, root->msi.base |=3D (uint64_t)val << 32; break; =20 - case DESIGNWARE_PCIE_MSI_INTR0_ENABLE: { - const bool update_msi_mapping =3D !root->msi.intr[0].enable ^ !!va= l; - + case DESIGNWARE_PCIE_MSI_INTR0_ENABLE: root->msi.intr[0].enable =3D val; - - if (update_msi_mapping) { - designware_pcie_root_update_msi_mapping(root); - } + designware_pcie_root_update_msi_mapping(root); break; - } =20 case DESIGNWARE_PCIE_MSI_INTR0_MASK: root->msi.intr[0].mask =3D val; --=20 2.20.1 From nobody Thu May 16 17:48:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1555379166; cv=none; d=zoho.com; s=zohoarc; b=kXfEXvoDRLIljqhVApwgrD++WmUiZi/TnZVbdtysJIepCRxhPEtXER5iSMyTmDf5mH3EmPb7WSnbPWj60yWkt3PSVDvUYV0h3/3OTtQpjMqZdaE4HIpozyXCUH9VcqN0b9xc4ya089GkpdLTy/SBU+fr3IU38qTIFY7+hpaLxjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555379166; h=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:ARC-Authentication-Results; bh=CcQQ1rkcReYyRFd9q5NYZ7+MasgATUr095l6CTEOr7Y=; b=HJHp6BYPkqk/wfwC+20IRmzjqTgfa9oxu1elTIq7AiKzXnnmfaZCu3yzY5/jbKspJ9DItAKPfAsDY+r+tke2Tr+1nVCFUILrd81epBSG7KKXN5UvwR9NghCpMyrejqsnAIGhlEx0v0VaDqg6vjgwGMV5pbI5+ytAY9kAozcAFLc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555379166728351.72799393244634; Mon, 15 Apr 2019 18:46:06 -0700 (PDT) Received: from localhost ([127.0.0.1]:57888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGDAh-00021s-RM for importer@patchew.org; Mon, 15 Apr 2019 21:46:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGD4U-0006VI-7K for qemu-devel@nongnu.org; Mon, 15 Apr 2019 21:39:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGD4T-0007pr-87 for qemu-devel@nongnu.org; Mon, 15 Apr 2019 21:39:38 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:42189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGD4Q-0007nx-VF; Mon, 15 Apr 2019 21:39:35 -0400 Received: by mail-pl1-x643.google.com with SMTP id cv12so9486410plb.9; Mon, 15 Apr 2019 18:39:34 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id v20sm74710362pfn.116.2019.04.15.18.39.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 18:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CcQQ1rkcReYyRFd9q5NYZ7+MasgATUr095l6CTEOr7Y=; b=SviWkZY4+p8LG0okjkXBCXUUPEEe4r/RynlgwM8g6ISPu1s0/hHQzETzjSRtdIUi3P rDByzE2ABy9xwI+nFiDXhD3k5JjUSlwwRwe6Ff6rKrZZaEaSvQ1hv4xy8VT+57gXeOYK Sq5EkFKyLDl9AC+xyjnC1Kmr+jYMN7GNTBkuSs0QnvfvU5KIRJS+GhHDLyxfeIkEVSDm s3CEveuEckhlGNRYgreYt/hiaN3SoOV0X4tc4s6rD5WIxt3M6D9g+Mq8+JrTTC423WEv 98yEho6T+8kct0O+Q5xS5jTOsxFRaZXIityMK2tSKJ13fX2H4Dabqy9RuMpLXG9CzB7y MyLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CcQQ1rkcReYyRFd9q5NYZ7+MasgATUr095l6CTEOr7Y=; b=PYIrsVQRqg/5GGI606879Vjo5BezDPH+fBPgNT1Mo4y9ewXDzPj/FFMDUzEGfEJDS6 96quGuwKYHf8yOn25jmOuyXqOOfgr3jDe+orlu4R5Eqs7JPVPTS738szudWT+9pFMdIb 4bN5Mj0Cyupa9VAedHT4cjodeUv552nkqIrH7Q6dJ4dPVlKE3DxmTc/AjfK/jJdJP+rM X6HH2ckdPq8lc0eO/UQtrOr9ELXGxNP3C/+BiYpC3aiDyqUnHsMkaTDNOErquTh1sFEO 6IlS09YxmHlA7//8tuW34k3+fpZmkcW/X8rTnF+b/clFYAQl3ShnBsOVIFn2NwOXtR+L D09w== X-Gm-Message-State: APjAAAU5w6MRajiJt6jT/xB38zPRKfvxtFPk6svOi68aOG6AQ4NGzS7R /cLtdigEbbzX41k+0p60AvRpMlfJ X-Google-Smtp-Source: APXvYqzQEbHbzkGup+C4dsh0Lmvvr1yzsQTEBT6Rlf5/x14HowIamk8wcSWbc6cU4Ozjs9ISYE4uJQ== X-Received: by 2002:a17:902:2aeb:: with SMTP id j98mr12371326plb.38.1555378773820; Mon, 15 Apr 2019 18:39:33 -0700 (PDT) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 15 Apr 2019 18:39:01 -0700 Message-Id: <20190416013902.4941-5-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190416013902.4941-1-andrew.smirnov@gmail.com> References: <20190416013902.4941-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::643 Subject: [Qemu-devel] [PATCH 4/5] pci: designware: Update MSI mapping when MSI address changes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , Peter Maydell , qemu-devel@nongnu.org, "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" MSI mapping needs to be update when MSI address changes, so add the code to do so. Signed-off-by: Andrey Smirnov Cc: Peter Maydell Cc: Michael S. Tsirkin Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Acked-by: Michael S. Tsirkin Reviewed-by: Peter Maydell --- hw/pci-host/designware.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index 6affe823c0..e80facc4a0 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -289,11 +289,13 @@ static void designware_pcie_root_config_write(PCIDevi= ce *d, uint32_t address, case DESIGNWARE_PCIE_MSI_ADDR_LO: root->msi.base &=3D 0xFFFFFFFF00000000ULL; root->msi.base |=3D val; + designware_pcie_root_update_msi_mapping(root); break; =20 case DESIGNWARE_PCIE_MSI_ADDR_HI: root->msi.base &=3D 0x00000000FFFFFFFFULL; root->msi.base |=3D (uint64_t)val << 32; + designware_pcie_root_update_msi_mapping(root); break; =20 case DESIGNWARE_PCIE_MSI_INTR0_ENABLE: --=20 2.20.1 From nobody Thu May 16 17:48:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1555378892; cv=none; d=zoho.com; s=zohoarc; b=g+6BpWVDhfSHJHjxU+uq2L9dlBqGRxTaNLxHxQzb5JlnZz95pCA6fhcyxu7ZauZ2sjT70mOkoAe7WWoi2qd5QZUaG+7NzMhB+OKWEbSmvTyHDtOBgkVwURtUnLLAAnLgSOh6gr1LL2T7DhjLZ8w4qkIJqvTPFUfuHDi9iBIcBVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555378892; h=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:ARC-Authentication-Results; bh=2Jrfp6guHhu12IiPCjZRuA1AOo7RUF4vA5QQQUxraEE=; b=DTZAl3w/dvWEG8K82uIERqHF014Y9oOk5CAvXtwP7x0y+QU1xPdBF21F2h3NDzOkcMoWA6XM5lJpaGy1iZv03rgPqyeYevbrydEV20whZrMwLQoQRFUL8F/JrQzOiGLQRNkXvR1GelhoH9LsP+XrzMN72scissE1Me0ZFjoy0WU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555378892624433.8086997560263; Mon, 15 Apr 2019 18:41:32 -0700 (PDT) Received: from localhost ([127.0.0.1]:57828 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGD6G-0007gB-M8 for importer@patchew.org; Mon, 15 Apr 2019 21:41:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGD4W-0006XX-1i for qemu-devel@nongnu.org; Mon, 15 Apr 2019 21:39:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGD4V-0007qx-1d for qemu-devel@nongnu.org; Mon, 15 Apr 2019 21:39:40 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:39762) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGD4S-0007p0-Kc; Mon, 15 Apr 2019 21:39:36 -0400 Received: by mail-pl1-x642.google.com with SMTP id a96so9474552pla.6; Mon, 15 Apr 2019 18:39:36 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id v20sm74710362pfn.116.2019.04.15.18.39.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 18:39:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2Jrfp6guHhu12IiPCjZRuA1AOo7RUF4vA5QQQUxraEE=; b=PnIQM4f1YSKwxMRbTTZ5RnvgndeWOtz4LRBQmjWczMxAVNGCBb73BXFoIc3057WBct BiWz1XS5dM09B2yAQVbYG+F+clxiM/wbc9Ol7cG+vNt5X0bTwuEZWyEOYBeSmpUNfSZT kdx1yf/01UHfp7UgjKIcFyWpFwIZJZncsnkSM1iVXidjgcMMpglUdTNOQfNElpgFTvXL VwZ62yk+7bjPm9rWi85C78+qgeoTbXmhQ83/hmuR7Cy9NrOn6ykJWDvK73115TjoEhOc kS0Y8zXv/duOV7r3MPIGU80+Qp5xBVhlyeenX252pIWCjaOKkeZ5ScFZrBjlrB1zDXmr cWcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2Jrfp6guHhu12IiPCjZRuA1AOo7RUF4vA5QQQUxraEE=; b=TWNCJyjAPqH7yJkWGM8EnEtdphH4FbNTWyMJ56CW8AWhl7sTUxW0ftQe5tJsBv1hTa XZSJDzzz8yFBiVRU180/uVSFrVkZTpNwO9YW8U2ggzkcfKwUDUfkfRWycD6lT5GhPgFv llBeZwESsJ6FkxbzNeSSv/WfooYvtBKRlN1xkJVhD9JcMnmoKKc+9fY66Yvsd31Sur22 jG0LqJC4j1N5zCh1VfELUbU8hBxTaPBTETokS/YcKdmEn2SzcNZmvXogANkkjBu5ma3V BunHAPLsyKFWCvrKzp+u1lDI1Tv2xAYQaeGqOVvfTTjkLPkkizfLa9keBcoa8KB1Uyt9 2QKA== X-Gm-Message-State: APjAAAVUO8olaqz8y74yKq8WQK0Ol3qFh6eA0gS19q5SUEPJuAEuoxhk DvNsUBvleoTQiaz73/O6D3AgLzy+ X-Google-Smtp-Source: APXvYqy1m4rplTbpYgUevdHEeRqfyc/1765/R/yv1kLkK4B3vFwXgFCUN0xMQTMB6bcKUt9ozCh58Q== X-Received: by 2002:a17:902:a5ca:: with SMTP id t10mr76432641plq.234.1555378775344; Mon, 15 Apr 2019 18:39:35 -0700 (PDT) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 15 Apr 2019 18:39:02 -0700 Message-Id: <20190416013902.4941-6-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190416013902.4941-1-andrew.smirnov@gmail.com> References: <20190416013902.4941-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 Subject: [Qemu-devel] [PATCH 5/5] i.mx7d: pci: Update PCI IRQ mapping to match HW X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , Peter Maydell , qemu-devel@nongnu.org, "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Datasheet for i.MX7 is incorrect and i.MX7's PCI IRQ mapping matches that of i.MX6: * INTD/MSI 122 * INTC 123 * INTB 124 * INTA 125 Fix all of the relevant code to reflect that fact. Needed by latest Linux kernels. Signed-off-by: Andrey Smirnov Cc: Peter Maydell Cc: Michael S. Tsirkin Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Reviewed-by: Peter Maydell --- include/hw/arm/fsl-imx7.h | 8 ++++---- hw/pci-host/designware.c | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index 3efa697adc..9750003a4f 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -213,10 +213,10 @@ enum FslIMX7IRQs { FSL_IMX7_USB2_IRQ =3D 42, FSL_IMX7_USB3_IRQ =3D 40, =20 - FSL_IMX7_PCI_INTA_IRQ =3D 122, - FSL_IMX7_PCI_INTB_IRQ =3D 123, - FSL_IMX7_PCI_INTC_IRQ =3D 124, - FSL_IMX7_PCI_INTD_IRQ =3D 125, + FSL_IMX7_PCI_INTA_IRQ =3D 125, + FSL_IMX7_PCI_INTB_IRQ =3D 124, + FSL_IMX7_PCI_INTC_IRQ =3D 123, + FSL_IMX7_PCI_INTD_IRQ =3D 122, =20 FSL_IMX7_UART7_IRQ =3D 126, =20 diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index e80facc4a0..f4c58b25c1 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -50,6 +50,8 @@ #define DESIGNWARE_PCIE_ATU_DEVFN(x) (((x) >> 16) & 0xff) #define DESIGNWARE_PCIE_ATU_UPPER_TARGET 0x91C =20 +#define DESIGNWARE_PCIE_IRQ_MSI 3 + static DesignwarePCIEHost * designware_pcie_root_to_host(DesignwarePCIERoot *root) { @@ -66,7 +68,7 @@ static void designware_pcie_root_msi_write(void *opaque, = hwaddr addr, root->msi.intr[0].status |=3D BIT(val) & root->msi.intr[0].enable; =20 if (root->msi.intr[0].status & ~root->msi.intr[0].mask) { - qemu_set_irq(host->pci.irqs[0], 1); + qemu_set_irq(host->pci.irqs[DESIGNWARE_PCIE_IRQ_MSI], 1); } } =20 @@ -310,7 +312,7 @@ static void designware_pcie_root_config_write(PCIDevice= *d, uint32_t address, case DESIGNWARE_PCIE_MSI_INTR0_STATUS: root->msi.intr[0].status ^=3D val; if (!root->msi.intr[0].status) { - qemu_set_irq(host->pci.irqs[0], 0); + qemu_set_irq(host->pci.irqs[DESIGNWARE_PCIE_IRQ_MSI], 0); } break; =20 --=20 2.20.1