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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 95235C43381 for ; Wed, 20 Mar 2019 19:55:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C99821873 for ; Wed, 20 Mar 2019 19:55:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553111730; bh=FNQoZVQri27pKZmZOf8e0umUwM0jKzokT6TC+ffk+U0=; h=Subject:To:Cc:From:Date:List-ID:From; b=NIeFVL/vXCQhBD2PC4ejYbh0a6NB4feJJxkW+E0WykFKbZ9YUEtQeiBJyiNYYGBY9 rVIxFxhsi8p3+K6qxeDFf9JLXrfxERyjImLNk+dXPTy+hnGGWaW1G4NJLDePHHg8q2 1WYCkR62C2s12ZdhfGwLsMX+U1jX3Lsn0Q6UB7OE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726366AbfCTTza (ORCPT ); Wed, 20 Mar 2019 15:55:30 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:41881 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726006AbfCTTz3 (ORCPT ); Wed, 20 Mar 2019 15:55:29 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id A83FB231CA; Wed, 20 Mar 2019 15:55:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 20 Mar 2019 15:55:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=tHBYI7 2gsyMDOFOYy5GjsLHvISyj2K6XLTna4JTHDRA=; b=aMoRVuqC93rJnYzlKYJYcm 2xg1qLpaCAQ/fuZx1B/GpZ2OohCzlL4NIUA0wqjaYdN4KQFD4ntn/LLldugaOjIi BQgITE/sBz3/ehItrqSuitAzzlI5EIRgFOiGq/0RjfCIsNY2Op5jLg2u/pL1P60M TsEf1lZYqoYv3UQNerfM/kpMTGTKLVS08m/vhfSSD+Juo2UH7ONyrkQZTxs/1rxQ +e2Ga6/dy4w0lCIeCDG7BKL3x97HgPZufvf5jgSvxknqCvjPMwval9ezdx32ZgYY k2PIryhIt+qUzIh01e1dMFP7MagieSLd2FTMbziwYyoBO6LbKuXAcIn0LFVC7TOA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrieeigddufedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecukfhppeekfedrkeeirdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomh epghhrvghgsehkrhhorghhrdgtohhmnecuvehluhhsthgvrhfuihiivgepfe X-ME-Proxy: Received: from localhost (5356596b.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 84509E4360; Wed, 20 Mar 2019 15:55:27 -0400 (EDT) Subject: FAILED: patch "[PATCH] PCI: dwc: skip MSI init if MSIs have been explicitly disabled" failed to apply to 4.14-stable tree To: l.stach@pengutronix.de, gustavo.pimentel@synopsys.com, lorenzo.pieralisi@arm.com, tharvey@gateworks.com Cc: From: Date: Wed, 20 Mar 2019 20:55:25 +0100 Message-ID: <1553111725119186@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3afc8299f39a27b60e1519a28e18878ce878e7dd Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Wed, 27 Feb 2019 17:52:19 +0100 Subject: [PATCH] PCI: dwc: skip MSI init if MSIs have been explicitly disabled Since 7c5925afbc58 (PCI: dwc: Move MSI IRQs allocation to IRQ domains hierarchical API) the MSI init claims one of the controller IRQs as a chained IRQ line for the MSI controller. On some designs, like the i.MX6, this line is shared with a PCIe legacy IRQ. When the line is claimed for the MSI domain, any device trying to use this legacy IRQs will fail to request this IRQ line. As MSI and legacy IRQs are already mutually exclusive on the DWC core, as the core won't forward any legacy IRQs once any MSI has been enabled, users wishing to use legacy IRQs already need to explictly disable MSI support (usually via the pci=nomsi kernel commandline option). To avoid any issues with MSI conflicting with legacy IRQs, just skip all of the DWC MSI initalization, including the IRQ line claim, when MSI is disabled. Fixes: 7c5925afbc58 ("PCI: dwc: Move MSI IRQs allocation to IRQ domains hierarchical API") Tested-by: Tim Harvey Signed-off-by: Lucas Stach Signed-off-by: Lorenzo Pieralisi Acked-by: Gustavo Pimentel Cc: stable@vger.kernel.org diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index 0c18ab63811f..25087d3c9a82 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -439,7 +439,7 @@ int dw_pcie_host_init(struct pcie_port *pp) if (ret) pci->num_viewport = 2; - if (IS_ENABLED(CONFIG_PCI_MSI)) { + if (IS_ENABLED(CONFIG_PCI_MSI) && pci_msi_enabled()) { /* * If a specific SoC driver needs to change the * default number of vectors, it needs to implement