mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Yijing Wang <wangyijing@huawei.com>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Bjorn Helgaas <bhelgaas@google.com>,
	"James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Gavin Shan <shangw@linux.vnet.ibm.com>,
	<linux-kernel@vger.kernel.org>, <linux-pci@vger.kernel.org>,
	Yijing Wang <wangyijing@huawei.com>,
	Hanjun Guo <guohanjun@huawei.com>
Subject: [PATCH v2 4/6] x86/pci: use pcie_cap to simplify code
Date: Thu, 5 Sep 2013 15:55:28 +0800	[thread overview]
Message-ID: <1378367730-25996-4-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1378367730-25996-1-git-send-email-wangyijing@huawei.com>

v1->v2: use pci_bus_set_ops to replace pci_ops
        and add a dev_info() to notify user that
        the pci_ops was replaced suggested by Bjorn.

PCI core saves PCIe Cap offset in pcie_cap,
use pcie_cap to simplify code. Also we should
use pci_bus_set_ops() to replace pci_ops for
safety and add a dev_info to notify user that
the pci_ops was replaced.

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
 arch/x86/pci/fixup.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index f5809fa..edd7879 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -252,7 +252,7 @@ static struct pci_ops quirk_pcie_aspm_ops = {
  */
 static void pcie_rootport_aspm_quirk(struct pci_dev *pdev)
 {
-	int cap_base, i;
+	int i;
 	struct pci_bus  *pbus;
 	struct pci_dev *dev;
 
@@ -278,7 +278,7 @@ static void pcie_rootport_aspm_quirk(struct pci_dev *pdev)
 		for (i = GET_INDEX(pdev->device, 0); i <= GET_INDEX(pdev->device, 7); ++i)
 			quirk_aspm_offset[i] = 0;
 
-		pbus->ops = pbus->parent->ops;
+		pci_bus_set_ops(pbus, pbus->parent->ops);
 	} else {
 		/*
 		 * If devices are attached to the root port at power-up or
@@ -286,13 +286,16 @@ static void pcie_rootport_aspm_quirk(struct pci_dev *pdev)
 		 * each root port to save the register offsets and replace the
 		 * bus ops.
 		 */
-		list_for_each_entry(dev, &pbus->devices, bus_list) {
+		list_for_each_entry(dev, &pbus->devices, bus_list)
 			/* There are 0 to 8 devices attached to this bus */
-			cap_base = pci_find_capability(dev, PCI_CAP_ID_EXP);
-			quirk_aspm_offset[GET_INDEX(pdev->device, dev->devfn)] = cap_base + 0x10;
-		}
-		pbus->ops = &quirk_pcie_aspm_ops;
+			quirk_aspm_offset[GET_INDEX(pdev->device, dev->devfn)] =
+				dev->pcie_cap + PCI_EXP_LNKCTL;
+
+		pci_bus_set_ops(pbus, &quirk_pcie_aspm_ops);
+		dev_info(&pbus->dev, "pci_ops is replaced by quirk_pcie_aspm_ops, "
+				"any writes to ASPM control bits will be ignored.\n");
 	}
+
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_MCH_PA,	pcie_rootport_aspm_quirk);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_MCH_PA1,	pcie_rootport_aspm_quirk);
-- 
1.7.1



  parent reply	other threads:[~2013-09-05  7:57 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-05  7:55 [PATCH v2 1/6] scsi/bfa: use pcie_set/get_readrq " Yijing Wang
2013-09-05  7:55 ` [PATCH v2 2/6] scsi/csiostor: use pcie_capability_xxx " Yijing Wang
2013-09-05  7:55 ` [PATCH v2 3/6] powerpc/pci: use pci_is_pcie() " Yijing Wang
2013-09-06 20:30   ` Bjorn Helgaas
2013-10-11  5:49     ` Benjamin Herrenschmidt
2013-10-11  6:28       ` Yijing Wang
     [not found]       ` <20131011061654.GA561@shangw.(null)>
2013-10-11  6:33         ` Yijing Wang
     [not found]           ` <20131011065329.GA5013@shangw.(null)>
2013-10-11  7:28             ` Yijing Wang
     [not found]               ` <20131011075642.GA20443@shangw.(null)>
2013-10-11  8:22                 ` Yijing Wang
2013-09-05  7:55 ` Yijing Wang [this message]
2013-09-05  7:55 ` [PATCH v2 5/6] PCI: " Yijing Wang
2013-09-05  7:55 ` [PATCH v2 6/6] scsi/qla2xxx: use pcie_is_pcie() " Yijing Wang
2013-09-06 18:17 ` [PATCH v2 1/6] scsi/bfa: use pcie_set/get_readrq " Jon Mason
2013-09-06 22:14 ` Bjorn Helgaas
2013-09-09  2:41   ` Yijing Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1378367730-25996-4-git-send-email-wangyijing@huawei.com \
    --to=wangyijing@huawei.com \
    --cc=JBottomley@parallels.com \
    --cc=benh@kernel.crashing.org \
    --cc=bhelgaas@google.com \
    --cc=guohanjun@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=shangw@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®