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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 00443C433E2 for ; Mon, 8 Jun 2020 23:11:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CCBF820897 for ; Mon, 8 Jun 2020 23:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657885; bh=9ys1xBFDNMN3Zfx1f8ojZ9OcYMAvbWAV2H7WG3ATJA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jJO5EsMncStDbl13/vtCJ/H/cHBg8jH7DkD00fFKCKsqh0Rc+4K6F9VnFPo+Km/wc zD78n+viQnOq4Vj6BCUlmUVJ+0E9Ef+7qwZBKElOegwAYewZoEB9mvS1WfTz0uvWBt z5AlA3PlQkIxu6MtdAL1Y5i5qQP2HqOADXMqC4Ho= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728187AbgFHXLY (ORCPT ); Mon, 8 Jun 2020 19:11:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:58170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728896AbgFHXLX (ORCPT ); Mon, 8 Jun 2020 19:11:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 18D1D20C09; Mon, 8 Jun 2020 23:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657882; bh=9ys1xBFDNMN3Zfx1f8ojZ9OcYMAvbWAV2H7WG3ATJA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nPpl+WRg1aRv7Zord3x1tl5h5yaXYlWqEnOdoRBfGijpXh6FMJhI0wI1UyH++svRU Ux2CXKefDuyR4IjonR9oygRJjCE3iqEkMZ69n/WJGyQLHTvaDo2U8mmXm1aAKqeUnr eXgPGaZVPa2lXxH2DDIIAKmS+WinsJDU5r4V/vt8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiaxun Yang , Bjorn Helgaas , Thomas Bogendoerfer , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 239/274] PCI: Don't disable decoding when mmio_always_on is set Date: Mon, 8 Jun 2020 19:05:32 -0400 Message-Id: <20200608230607.3361041-239-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608230607.3361041-1-sashal@kernel.org> References: <20200608230607.3361041-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jiaxun Yang [ Upstream commit b6caa1d8c80cb71b6162cb1f1ec13aa655026c9f ] Don't disable MEM/IO decoding when a device have both non_compliant_bars and mmio_always_on. That would allow us quirk devices with junk in BARs but can't disable their decoding. Signed-off-by: Jiaxun Yang Acked-by: Bjorn Helgaas Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- drivers/pci/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 77b8a145c39b..d9c2c3301a8a 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1822,7 +1822,7 @@ int pci_setup_device(struct pci_dev *dev) /* Device class may be changed after fixup */ class = dev->class >> 8; - if (dev->non_compliant_bars) { + if (dev->non_compliant_bars && !dev->mmio_always_on) { pci_read_config_word(dev, PCI_COMMAND, &cmd); if (cmd & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) { pci_info(dev, "device has non-compliant BARs; disabling IO/MEM decoding\n"); -- 2.25.1