From patchwork Fri Apr 28 16:02:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 756465 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wDz1l68mrz9s84 for ; Sat, 29 Apr 2017 01:55:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2998872AbdD1Pzy (ORCPT ); Fri, 28 Apr 2017 11:55:54 -0400 Received: from mga06.intel.com ([134.134.136.31]:6646 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2998869AbdD1Pzx (ORCPT ); Fri, 28 Apr 2017 11:55:53 -0400 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP; 28 Apr 2017 08:55:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,388,1488873600"; d="scan'208";a="95073576" Received: from unknown (HELO localhost.lm.intel.com) ([10.232.112.96]) by fmsmga005.fm.intel.com with ESMTP; 28 Apr 2017 08:55:42 -0700 From: Keith Busch To: Bjorn Helgaas , linux-pci@vger.kernel.org Cc: Wesley Yung , Sammy Hui , Joseph Gruher , Wei Zhang , Krishna Dhulipala , Keith Busch Subject: [PATCH 2/2] pcie/dpc: Fix control register setting Date: Fri, 28 Apr 2017 12:02:49 -0400 Message-Id: <1493395369-20225-3-git-send-email-keith.busch@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1493395369-20225-1-git-send-email-keith.busch@intel.com> References: <1493395369-20225-1-git-send-email-keith.busch@intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This driver was OR'ing desired bits from the existing control setting. That could create an invalid DPC Trigger Enabled configuration if the platform previously set this to "ERR_FATAL", 01b. The driver currently wants to set this to ERR_NONFATAL/ERR_FATAL, 10b, and the logical OR of this gets 11b, which is reserved. This patch fixes that by masking off the fields it is setting. Signed-off-by: Keith Busch --- drivers/pci/pcie/pcie-dpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pcie/pcie-dpc.c b/drivers/pci/pcie/pcie-dpc.c index fc2a4a7..88a66b4 100644 --- a/drivers/pci/pcie/pcie-dpc.c +++ b/drivers/pci/pcie/pcie-dpc.c @@ -139,7 +139,7 @@ static int dpc_probe(struct pcie_device *dev) dpc->rp = (cap & PCI_EXP_DPC_CAP_RP_EXT); - ctl |= PCI_EXP_DPC_CTL_EN_NONFATAL | PCI_EXP_DPC_CTL_INT_EN; + ctl = (ctl & 0xfff4) | PCI_EXP_DPC_CTL_EN_NONFATAL | PCI_EXP_DPC_CTL_INT_EN; pci_write_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, ctl); dev_info(&dev->device, "DPC error containment capabilities: Int Msg #%d, RPExt%c PoisonedTLP%c SwTrigger%c RP PIO Log %d, DL_ActiveErr%c\n",