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 B03ECC433DF for ; Mon, 8 Jun 2020 23:46:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 88441204EF for ; Mon, 8 Jun 2020 23:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591659988; bh=ROXJ/dCfl2QDTiLF5kuqW9IcXc8XrfktjT2CXamAzmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MIRtJ7aTAL7WVrVrONX6sEopct3fS2cDOUmnCmiGaLxEUKsUT4r8KXiJiZrLkBLY2 s6CXBqF2ej8xn1QHRSsfgZTnd5RwQQmE9MznFLl4YVzxn8W8S8IsioLtH6AIT0SJG6 mAvQjtEKVbfSeMdZTfTMQ5vmvTZplxAPtQ3z9Unk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732384AbgFHXq1 (ORCPT ); Mon, 8 Jun 2020 19:46:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:53844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731242AbgFHX0Y (ORCPT ); Mon, 8 Jun 2020 19:26:24 -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 167E62074B; Mon, 8 Jun 2020 23:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658783; bh=ROXJ/dCfl2QDTiLF5kuqW9IcXc8XrfktjT2CXamAzmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h+4nwy2pIs5FViw17fJboPl+6izCUk+Ae9S/LIn2/gAUsVMQAxm5BlIhkgDgejIeu fZ1nq6Kng5Nf5r5Dhfoie0nyM+KXlK1Lt6Fmy3ziDz2h3jRQ0nwoOjWfVTngKByWEN 9ltXdjQlKCiglBfvnojnIAkn+OR+k6pzbMdd2laE= 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 4.14 60/72] PCI: Don't disable decoding when mmio_always_on is set Date: Mon, 8 Jun 2020 19:24:48 -0400 Message-Id: <20200608232500.3369581-60-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608232500.3369581-1-sashal@kernel.org> References: <20200608232500.3369581-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 e23bfd9845b1..92c3abe0b2b9 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1446,7 +1446,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)) { dev_info(&dev->dev, "device has non-compliant BARs; disabling IO/MEM decoding\n"); -- 2.25.1