From patchwork Wed Sep 20 21:21:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Bezzubikov X-Patchwork-Id: 9962621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 769FC60234 for ; Wed, 20 Sep 2017 21:22:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 693DC2925B for ; Wed, 20 Sep 2017 21:22:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5DC632925D; Wed, 20 Sep 2017 21:22:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D91A02925B for ; Wed, 20 Sep 2017 21:21:59 +0000 (UTC) Received: from localhost ([::1]:50728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dumRS-0007hu-CT for patchwork-qemu-devel@patchwork.kernel.org; Wed, 20 Sep 2017 17:21:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dumQq-0007hd-9x for qemu-devel@nongnu.org; Wed, 20 Sep 2017 17:21:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dumQm-0006c5-VQ for qemu-devel@nongnu.org; Wed, 20 Sep 2017 17:21:20 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:33241) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dumQm-0006bT-Mj for qemu-devel@nongnu.org; Wed, 20 Sep 2017 17:21:16 -0400 Received: by mail-lf0-x241.google.com with SMTP id y15so2015421lfd.0 for ; Wed, 20 Sep 2017 14:21:16 -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; bh=RI72ZMT1bRSjqAeuSfknIg+8Sbzb1CaIk2Z1/0eAmos=; b=AR9hNvMrbjZ8gwdKRYVXCDBhY+ztHJa4y0tG+nb42KJ5wm5wmSBVaXz/VJANP9J/CT /OenNz+pq4O6P18L+G/8JSHfBqi4hWXjQXx4qv4GnrwGFBdkIh0x5F4borjRCTON+q7N o9XF0EHkIv9FOFTuxqwmygaCBeVTXec5d8y5/MvulozKkJ6SGn9cdbr+gK8x0pFB/nMU JwJYt3qRRAXfb8UbaP3z13ec5mELAuHHXvssgHtY0B9Wc/NmCIlZjPu04STwv5gOcOgW SjSYpwLRpUA19xiXNy66JTP+7qmrFURPgLUUXo2c3A7nPRYcMhaa2yekUURaTzwTLc5C 4oFw== 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; bh=RI72ZMT1bRSjqAeuSfknIg+8Sbzb1CaIk2Z1/0eAmos=; b=PPhsfUhy7V8LHlqROHEpVE/pal86WpdYyZxnA8wRHN4mRpflnwdUK893o/9WTtTLYj RVtzYTVXLfVFowDr8k06oYcuIWbiGUR2xYNgiQb0tKovab42vMwZXkf8nAds/esGQrfz xVjMqEepZCY0+zMqtb5XJyghF27hJ9PiPoGNnFtylLgvN3C6bh06CYj+mMBc8Nyh+7Sa pTRX4F81WEqlG/w/Yw9Cje/DR9rgONzuK4jklkTfSkNI+mL5LPavyZMYnExwOYfMHGgO QNYeqD7eQ+AerUsodzvXYu6Udazd8Soiycq8+9QNX1u6jLgd52u4O96yOttOepwRmFwe 0jqg== X-Gm-Message-State: AHPjjUgxhXi3EZgMvUiP1ka/qxOfgSBham526BoZLbGjXa3dVQ7VxMfG lLV/oLkfJpuEotnXXrMF4HqTfA== X-Google-Smtp-Source: AOwi7QARdujBnni6mKHZFOAwz1PQivUHyHBCvGACKVnVKIFyFRoLHAOHrRZykAjAEMXa7tLsHWbvYQ== X-Received: by 10.46.25.140 with SMTP id 12mr15928ljz.145.1505942475155; Wed, 20 Sep 2017 14:21:15 -0700 (PDT) Received: from localhost.localdomain (broadband-188-32-15-160.moscow.rt.ru. [188.32.15.160]) by smtp.gmail.com with ESMTPSA id q125sm587958ljb.55.2017.09.20.14.21.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Sep 2017 14:21:14 -0700 (PDT) From: Aleksandr Bezzubikov To: qemu-devel@nongnu.org Date: Thu, 21 Sep 2017 00:21:11 +0300 Message-Id: <1505942471-11260-1-git-send-email-zuban32s@gmail.com> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::241 Subject: [Qemu-devel] [PATCH] hw/pci-bridge/pcie_pci_bridge: properly handle MSI unavailability case 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: marcel@redhat.com, Aleksandr Bezzubikov , mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Aleksandr Bezzubikov Reviewed-by: Marcel Apfelbaum --- hw/pci-bridge/pcie_pci_bridge.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c index 9aa5cc3..da562fe 100644 --- a/hw/pci-bridge/pcie_pci_bridge.c +++ b/hw/pci-bridge/pcie_pci_bridge.c @@ -65,10 +65,18 @@ static void pcie_pci_bridge_realize(PCIDevice *d, Error **errp) goto aer_error; } + Error *local_err = NULL; if (pcie_br->msi != ON_OFF_AUTO_OFF) { - rc = msi_init(d, 0, 1, true, true, errp); + rc = msi_init(d, 0, 1, true, true, &local_err); if (rc < 0) { - goto msi_error; + assert(rc == -ENOTSUP); + if (pcie_br->msi != ON_OFF_AUTO_ON) { + error_free(local_err); + } else { + /* failed to satisfy user's explicit request for MSI */ + error_propagate(errp, local_err); + goto msi_error; + } } } pci_register_bar(d, 0, PCI_BASE_ADDRESS_SPACE_MEMORY | @@ -81,7 +89,7 @@ aer_error: pm_error: pcie_cap_exit(d); cap_error: - shpc_free(d); + shpc_cleanup(d, &pcie_br->shpc_bar); error: pci_bridge_exitfn(d); } @@ -98,7 +106,9 @@ static void pcie_pci_bridge_reset(DeviceState *qdev) { PCIDevice *d = PCI_DEVICE(qdev); pci_bridge_reset(qdev); - msi_reset(d); + if (msi_present(d)) { + msi_reset(d); + } shpc_reset(d); } @@ -106,12 +116,14 @@ static void pcie_pci_bridge_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len) { pci_bridge_write_config(d, address, val, len); - msi_write_config(d, address, val, len); + if (msi_present(d)) { + msi_write_config(d, address, val, len); + } shpc_cap_write_config(d, address, val, len); } static Property pcie_pci_bridge_dev_properties[] = { - DEFINE_PROP_ON_OFF_AUTO("msi", PCIEPCIBridge, msi, ON_OFF_AUTO_ON), + DEFINE_PROP_ON_OFF_AUTO("msi", PCIEPCIBridge, msi, ON_OFF_AUTO_AUTO), DEFINE_PROP_END_OF_LIST(), };