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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 71354C43603 for ; Thu, 19 Dec 2019 19:08:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42B8824672 for ; Thu, 19 Dec 2019 19:08:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576782507; bh=s8lFt2f6UFXAvxzI8p/aGzswDdvHAAy7eKpr0m3ZPdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iFWpQdcaaSQxXnPPFLLC8POooKVkgleDkIT1eX2Wu0ix4x84pLk+Dzilrb9J1FtGI 0AdlVdouz06yLI5KzS9wf8mWTlXsL8HIOpu8YM2cYJTyx9NtoLBgaRE9jum1CjdsGy ickcQSj42aRhioIJBFD13ipwmexo9vcH+yt24YJU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727417AbfLSTIW (ORCPT ); Thu, 19 Dec 2019 14:08:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:32980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728350AbfLSSl5 (ORCPT ); Thu, 19 Dec 2019 13:41:57 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 694C0206D7; Thu, 19 Dec 2019 18:41:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780916; bh=s8lFt2f6UFXAvxzI8p/aGzswDdvHAAy7eKpr0m3ZPdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BrLNWmNg+LIiVolbVpWKuhiUP2l8AwyIiSGM6kIf1oHB5AMGofKEVggFi7TXDblZq JZeQzMQUE7b7Q5mv4YM4IyZeaqjpeFVGmAZdWvB5PrTzuS3Z1q9aC8D9woMUfsdhXa GummEvNZN9hf9WPOoRRW/DY4YMdOc7ggzAb4qfJ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steffen Liebergeld , Bjorn Helgaas , Andrew Murray , Ashok Raj Subject: [PATCH 4.4 151/162] PCI: Fix Intel ACS quirk UPDCR register address Date: Thu, 19 Dec 2019 19:34:19 +0100 Message-Id: <20191219183216.969438627@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Steffen Liebergeld commit d8558ac8c93d429d65d7490b512a3a67e559d0d4 upstream. According to documentation [0] the correct offset for the Upstream Peer Decode Configuration Register (UPDCR) is 0x1014. It was previously defined as 0x1114. d99321b63b1f ("PCI: Enable quirks for PCIe ACS on Intel PCH root ports") intended to enforce isolation between PCI devices allowing them to be put into separate IOMMU groups. Due to the wrong register offset the intended isolation was not fully enforced. This is fixed with this patch. Please note that I did not test this patch because I have no hardware that implements this register. [0] https://www.intel.com/content/dam/www/public/us/en/documents/datasheets/4th-gen-core-family-mobile-i-o-datasheet.pdf (page 325) Fixes: d99321b63b1f ("PCI: Enable quirks for PCIe ACS on Intel PCH root ports") Link: https://lore.kernel.org/r/7a3505df-79ba-8a28-464c-88b83eefffa6@kernkonzept.com Signed-off-by: Steffen Liebergeld Signed-off-by: Bjorn Helgaas Reviewed-by: Andrew Murray Acked-by: Ashok Raj Cc: stable@vger.kernel.org # v3.15+ Signed-off-by: Greg Kroah-Hartman --- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4038,7 +4038,7 @@ int pci_dev_specific_acs_enabled(struct #define INTEL_BSPR_REG_BPPD (1 << 9) /* Upstream Peer Decode Configuration Register */ -#define INTEL_UPDCR_REG 0x1114 +#define INTEL_UPDCR_REG 0x1014 /* 5:0 Peer Decode Enable bits */ #define INTEL_UPDCR_REG_MASK 0x3f