Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1772273imm; Thu, 27 Sep 2018 02:11:50 -0700 (PDT) X-Google-Smtp-Source: ACcGV61GYjlRpLoxrlaqW5cibiJzjujVsObyAgGvQIPXZG9Z1QUmenbMDVS6XRQT6pOd7VjWfyWz X-Received: by 2002:a63:c4f:: with SMTP id 15-v6mr9304050pgm.155.1538039510424; Thu, 27 Sep 2018 02:11:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538039510; cv=none; d=google.com; s=arc-20160816; b=ZK0zbMSJpnflIw+9FVl3Py4yzmM4uyKu4ewMXwrdvjltRkbi0yhEnwmuMVPIXvvHKD uYuy0/x3/vNcEF8pOGICmk4Jjxu0r94GihIAimVcOwCYQo6Q33nPiHjpBTQrPmYpmBlw jrLKRCU9Sjmu/CnYYolYHGoMXbfrbFpbYvQBItupLZXOe5Fo9UgFMeAsgv4An8eGHq3r D65jb3usQ2G1lLP5s+OlG66HpCtc1q/znP+pCQPHXoZI/GK1xB2tW7J96nWyPXs9YJ9W D+yABiENw8j8n2tDQJQECiL1ZTf+xNACbxGBv7tbAOfMMrmIogv0HkG+GwgRm0q/PZ0v /XrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from; bh=OfWwO+3drsNZOyK7MbgIx1bHM7uZAMxCTZ6mzicmMsE=; b=NKy++27tC8+fA0Bz2P2NJd3SJlJmFUVSZM8aj9dZf8bWtVef/XXo05rIauKTZIB0mX AOREGrX0jB70Ne0cB28nplbr4KPYcIiJyz+x7ZK4z6xyQkjpq3aKYoAvTnQuStYoz6sI UElfsRI7bGzaTxhZuxhSj5yhYRm5A/shSxujevgt4KK6NfF6f8ycYNHhyBUHhbv0hSml ZfXkSrnaZyJudWeBi7cGfVZ/EqqWD9pStUDmKJhG3pe0LU+sWkswnDM1Qk4JnE+Xg3HW FWZTQ0iUOTIQ07PZ+aRbZUqMQdA92tGppr8nmGmqpgjXtHRaxwSaAGTp+gpGlLnKE0aR jMng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u11-v6si1450313pgg.683.2018.09.27.02.11.35; Thu, 27 Sep 2018 02:11:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728457AbeI0P17 (ORCPT + 99 others); Thu, 27 Sep 2018 11:27:59 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55174 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727569AbeI0P17 (ORCPT ); Thu, 27 Sep 2018 11:27:59 -0400 Received: from localhost (ip-213-127-77-73.ip.prioritytelecom.net [213.127.77.73]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 196E0111D; Thu, 27 Sep 2018 09:10:42 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mika Westerberg , Bjorn Helgaas Subject: [PATCH 4.18 47/88] Revert "PCI: Add ACS quirk for Intel 300 series" Date: Thu, 27 Sep 2018 11:03:28 +0200 Message-Id: <20180927090306.526250930@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180927090300.631426620@linuxfoundation.org> References: <20180927090300.631426620@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mika Westerberg commit 50ca031b51106b1b46162d4e9ecccb7edc95682f upstream. This reverts f154a718e6cc ("PCI: Add ACS quirk for Intel 300 series"). It turns out that erratum "PCH PCIe* Controller Root Port (ACSCTLR) Appear As Read Only" has been fixed in 300 series chipsets, even though the datasheet [1] claims otherwise. To make ACS work properly on 300 series root ports, revert the faulty commit. [1] https://www.intel.com/content/dam/www/public/us/en/documents/specification-updates/300-series-c240-series-chipset-pch-spec-update.pdf Fixes: f154a718e6cc ("PCI: Add ACS quirk for Intel 300 series") Signed-off-by: Mika Westerberg Signed-off-by: Bjorn Helgaas Cc: stable@vger.kernel.org # v4.18+ Signed-off-by: Greg Kroah-Hartman --- drivers/pci/quirks.c | 6 ------ 1 file changed, 6 deletions(-) --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4235,11 +4235,6 @@ static int pci_quirk_qcom_rp_acs(struct * * 0x9d10-0x9d1b PCI Express Root port #{1-12} * - * The 300 series chipset suffers from the same bug so include those root - * ports here as well. - * - * 0xa32c-0xa343 PCI Express Root port #{0-24} - * * [1] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-datasheet-vol-2.html * [2] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-datasheet-vol-1.html * [3] http://www.intel.com/content/www/us/en/chipsets/100-series-chipset-spec-update.html @@ -4257,7 +4252,6 @@ static bool pci_quirk_intel_spt_pch_acs_ case 0xa110 ... 0xa11f: case 0xa167 ... 0xa16a: /* Sunrise Point */ case 0xa290 ... 0xa29f: case 0xa2e7 ... 0xa2ee: /* Union Point */ case 0x9d10 ... 0x9d1b: /* 7th & 8th Gen Mobile */ - case 0xa32c ... 0xa343: /* 300 series */ return true; }