From patchwork Thu Feb 1 02:53:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 868128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=fredlawl-com.20150623.gappssmtp.com header.i=@fredlawl-com.20150623.gappssmtp.com header.b="e2hKnKFF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zX4Sl0M1Wz9s7M for ; Thu, 1 Feb 2018 13:53:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751296AbeBACx6 (ORCPT ); Wed, 31 Jan 2018 21:53:58 -0500 Received: from mail-oi0-f65.google.com ([209.85.218.65]:43505 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751163AbeBACx5 (ORCPT ); Wed, 31 Jan 2018 21:53:57 -0500 Received: by mail-oi0-f65.google.com with SMTP id 4so12233487ois.10 for ; Wed, 31 Jan 2018 18:53:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fredlawl-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=35wstgia76+1v9Rw60QyuIHEGeWvlCRQZa55LrxFh3o=; b=e2hKnKFFs9FxsIrY6yJhDB49s3sbIJ81LqQg6UWwuEXH467Yv+cBEjeXspxWf9uiSY YoErdoiNCjcu+jkHGecSyT84a9QDiXom6wLiEVvQSOce3cDuriHN4Y24eHONMLqh572a GXS0TyYmmHvz9V3ZyME31CbftzoBf17PTdvyps5yHAAii+UTmLhuA0OQC/sIbAUwGwJX 5sG5tO+fYlvelcHQ6CP+TNdzl5P+MI56l45ZhA7LLpfgOpuWHJp4U/tXsmfWEYDwU3NN pGc67muXM8mFxcivpotBWSwY7kvGopYtuGJTkANhA9JiAnTCcJwwPB87cng1edHv2Gia 9Htg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=35wstgia76+1v9Rw60QyuIHEGeWvlCRQZa55LrxFh3o=; b=fr9s/6Mf2d+mfSxBe40dyAlXbe24pgP+QlNDTW8blV+6Z/EsehITF/8ECXGvyLk3jN JekAMQMxxfX8AhKwA5x5XhNYg654ySIYEPxJpYTKImJRvUBze2Z/yvonoFLkcvcYA2J0 h/jAGQocROMWFHzRpA4EmBFbAYMPoHfUN9fX7KjsifJ/3aZEN8RiU7MbKpXtBFkIXfWA waaM2HrEDjyLMj/3wf+JwEMtJlXy4fBty+j45F2Rgo1MM1VqbsrUSvZVzgJSwfxFIGUB oi3m0P2ToOyf2XtiS17Wr+jUsBEpulhZY43IqrlMJBbYXvZuQgAhSn5PFTsUbE4yTiE1 mN5A== X-Gm-Message-State: AKwxyte+Vn/M/e0KtNfbl3DUl5YIWwv2dBArgzUboJcZM1iNo3jBzBGO gLQvz5ZWIPyYrvKZ4CtHGx6uWm/5McQ= X-Google-Smtp-Source: AH8x226BGr8jI5TA3Pl5O6Jx52o5dfC+YJzBvloCqn0isOeq0u/mkKBRfv45F+V0yirPdAu4eVKF1Q== X-Received: by 10.202.232.211 with SMTP id f202mr22938962oih.128.1517453635763; Wed, 31 Jan 2018 18:53:55 -0800 (PST) Received: from local.linuxcompiler (99-51-182-25.lightspeed.kscyks.sbcglobal.net. [99.51.182.25]) by smtp.gmail.com with ESMTPSA id u9sm5117403otd.68.2018.01.31.18.53.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Jan 2018 18:53:54 -0800 (PST) From: Frederick Lawler To: linux-pci@vger.kernel.org Cc: helgaas@kernel.org, Frederick Lawler Subject: [PATCH v2 1/1] PCI: Replace pci_find_ext_capability() calls with pci_dev aer_cap Date: Wed, 31 Jan 2018 20:53:45 -0600 Message-Id: <1517453625-13110-2-git-send-email-fred@fredlawl.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517453625-13110-1-git-send-email-fred@fredlawl.com> References: <1517453625-13110-1-git-send-email-fred@fredlawl.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Replace pci_find_ext_capability(..., PCI_EXT_CAP_ID_ERR) calls with pci_dev aer_cap. Signed-off-by: Frederick Lawler --- V2: * Reset program_hpp_type2() in probe.c back to its original state --- drivers/pci/pcie/aer/aer_inject.c | 4 ++-- drivers/pci/pcie/aer/ecrc.c | 4 ++-- drivers/pci/pcie/portdrv_core.c | 15 +++++++++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c index 2b6a592..c8e6634 100644 --- a/drivers/pci/pcie/aer/aer_inject.c +++ b/drivers/pci/pcie/aer/aer_inject.c @@ -349,7 +349,7 @@ static int aer_inject(struct aer_error_inj *einj) goto out_put; } - pos_cap_err = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR); + pos_cap_err = dev->aer_cap; if (!pos_cap_err) { dev_err(&dev->dev, "aer_inject: Device doesn't support AER\n"); ret = -EPROTONOSUPPORT; @@ -360,7 +360,7 @@ static int aer_inject(struct aer_error_inj *einj) pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_MASK, &uncor_mask); - rp_pos_cap_err = pci_find_ext_capability(rpdev, PCI_EXT_CAP_ID_ERR); + rp_pos_cap_err = rpdev->aer_cap; if (!rp_pos_cap_err) { dev_err(&rpdev->dev, "aer_inject: Root port doesn't support AER\n"); diff --git a/drivers/pci/pcie/aer/ecrc.c b/drivers/pci/pcie/aer/ecrc.c index a2747a6..18289be 100644 --- a/drivers/pci/pcie/aer/ecrc.c +++ b/drivers/pci/pcie/aer/ecrc.c @@ -54,7 +54,7 @@ static int enable_ecrc_checking(struct pci_dev *dev) if (!pci_is_pcie(dev)) return -ENODEV; - pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR); + pos = dev->aer_cap; if (!pos) return -ENODEV; @@ -82,7 +82,7 @@ static int disable_ecrc_checking(struct pci_dev *dev) if (!pci_is_pcie(dev)) return -ENODEV; - pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR); + pos = dev->aer_cap; if (!pos) return -ENODEV; diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index a592103..5a5d817 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c @@ -52,7 +52,7 @@ static void release_pcie_device(struct device *dev) static int pcie_message_numbers(struct pci_dev *dev, int mask, u32 *pme, u32 *aer, u32 *dpc) { - u32 nvec = 0, pos, reg32; + u32 nvec = 0, pos; u16 reg16; /* @@ -68,8 +68,11 @@ static int pcie_message_numbers(struct pci_dev *dev, int mask, nvec = *pme + 1; } +#ifdef CONFIG_PCIEAER if (mask & PCIE_PORT_SERVICE_AER) { - pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR); + u32 reg32; + + pos = dev->aer_cap; if (pos) { pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, ®32); @@ -77,6 +80,7 @@ static int pcie_message_numbers(struct pci_dev *dev, int mask, nvec = max(nvec, *aer + 1); } } +#endif if (mask & PCIE_PORT_SERVICE_DPC) { pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC); @@ -233,9 +237,10 @@ static int get_port_device_capability(struct pci_dev *dev) pcie_capability_clear_word(dev, PCI_EXP_SLTCTL, PCI_EXP_SLTCTL_CCIE | PCI_EXP_SLTCTL_HPIE); } + +#ifdef CONFIG_PCIEAER /* AER capable */ - if ((cap_mask & PCIE_PORT_SERVICE_AER) - && pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR)) { + if ((cap_mask & PCIE_PORT_SERVICE_AER) && dev->aer_cap) { services |= PCIE_PORT_SERVICE_AER; /* * Disable AER on this port in case it's been enabled by the @@ -243,6 +248,8 @@ static int get_port_device_capability(struct pci_dev *dev) */ pci_disable_pcie_error_reporting(dev); } +#endif + /* VC support */ if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_VC)) services |= PCIE_PORT_SERVICE_VC;