From patchwork Wed Aug 1 15:54:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 174503 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 971932C0084 for ; Thu, 2 Aug 2012 02:03:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755901Ab2HAP5T (ORCPT ); Wed, 1 Aug 2012 11:57:19 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:61462 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753913Ab2HAP5R (ORCPT ); Wed, 1 Aug 2012 11:57:17 -0400 Received: by yenl2 with SMTP id l2so7449160yen.19 for ; Wed, 01 Aug 2012 08:57:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=HLLsKpX6V1+4Y+kCEiIET68+RYvBNpA3FpaQrFmWuRA=; b=uBF4cIXH/hAJBkUfxTFb90y8/qVfW6nx4zYDjKszjtDGqZd24kqptU5h3LPsmuJi/Y hCPOmNtEGe78UUcEvmG1AEzyUhjw1C/YvoacWSrzoaw8BloYzdiju3WZnskcb380Y05c qDPOUcg9sxHAy4J3JS1Bd95L4vIqlttEnVZy8+ONYea3EDaRGa7Ko3FV5QHNTLqgHD7u /fdFn4DrGKBhYnvZitml2S4W37VzRE7zZdWgpd0ZSWaahrF6wQjIplb3b8yVNOYiPGKC JPzEBVnKdbWeRGmssbRNePz9smsmNRdvc8dXZyOBWsHQ2/l/Oxn+9lSvs3PWFdzBUEP/ j8Ag== Received: by 10.68.239.103 with SMTP id vr7mr54379063pbc.0.1343836636566; Wed, 01 Aug 2012 08:57:16 -0700 (PDT) Received: from localhost.localdomain ([58.250.81.2]) by mx.google.com with ESMTPS id pe8sm2816231pbc.76.2012.08.01.08.57.07 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Aug 2012 08:57:15 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Don Dutile , Ralf Baechle Cc: Jiang Liu , Yinghai Lu , Taku Izumi , "Rafael J . Wysocki" , Kenji Kaneshige , Yijing Wang , linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [PATCH v3 13/32] PCI/MIPS: use PCIe capabilities access functions to simplify implementation Date: Wed, 1 Aug 2012 23:54:18 +0800 Message-Id: <1343836477-7287-14-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343836477-7287-1-git-send-email-jiang.liu@huawei.com> References: <1343836477-7287-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu Use PCIe capabilities access functions to simplify PCIe MIPS implementation. Signed-off-by: Jiang Liu Acked-by: David Daney --- arch/mips/pci/pci-octeon.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c index 52a1ba7..aaed2ad 100644 --- a/arch/mips/pci/pci-octeon.c +++ b/arch/mips/pci/pci-octeon.c @@ -117,16 +117,11 @@ int pcibios_plat_dev_init(struct pci_dev *dev) } /* Enable the PCIe normal error reporting */ - pos = pci_find_capability(dev, PCI_CAP_ID_EXP); - if (pos) { - /* Update Device Control */ - pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &config); - config |= PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */ - config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */ - config |= PCI_EXP_DEVCTL_FERE; /* Fatal Error Reporting */ - config |= PCI_EXP_DEVCTL_URRE; /* Unsupported Request */ - pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, config); - } + config = PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */ + config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */ + config |= PCI_EXP_DEVCTL_FERE; /* Fatal Error Reporting */ + config |= PCI_EXP_DEVCTL_URRE; /* Unsupported Request */ + pci_pcie_capability_change_word(dev, PCI_EXP_DEVCTL, config, 0); /* Find the Advanced Error Reporting capability */ pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);