From patchwork Wed Aug 1 15:54:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 174505 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 8B0F22C007F for ; Thu, 2 Aug 2012 02:03:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755791Ab2HAP4k (ORCPT ); Wed, 1 Aug 2012 11:56:40 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:57673 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755880Ab2HAP4h (ORCPT ); Wed, 1 Aug 2012 11:56:37 -0400 Received: by mail-gh0-f174.google.com with SMTP id r11so984595ghr.19 for ; Wed, 01 Aug 2012 08:56:36 -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=Ck2saRRlF37gsFzVvCztthVhiAAJpZ6xbpckbX0j9Lw=; b=k0JgKR4u7/YObIh7Phfyg0xJTXrzUD9AvG8StyYKterdhpIC9TvT40N+3oLvjVL/sj uWvIKN52noO/1ioc5r5cNDKCujQ1Fh6uBBtzvVmjC3pVEbRq9stxs8drfEY3ucbki8VK DS73QMKEumkP2eVDCsoU0Bu6kb+bprnIHl52b2YArdBzEv48wVMpARh9LO92qRtOZD/X 0g7dj7nbtoUA7zuvPFTz1Slx8V9VgTruixh6arIlIBw/66xIsagIIvSe2LptGl3yH3Ol XkXZX7VLmf4I2tGXGKjs7OqpW5jHOBo+KEtOES0DfZDhU5YVJQFoywjMITVdZ+Z13+Ih oOYQ== Received: by 10.66.73.132 with SMTP id l4mr41076400pav.30.1343836596361; Wed, 01 Aug 2012 08:56:36 -0700 (PDT) Received: from localhost.localdomain ([58.250.81.2]) by mx.google.com with ESMTPS id pe8sm2816231pbc.76.2012.08.01.08.56.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Aug 2012 08:56:35 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Don Dutile Cc: Jiang Liu , Yinghai Lu , Taku Izumi , "Rafael J . Wysocki" , Kenji Kaneshige , Yijing Wang , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [PATCH v3 09/32] PCI/PME: use PCIe capabilities access functions to simplify implementation Date: Wed, 1 Aug 2012 23:54:14 +0800 Message-Id: <1343836477-7287-10-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 PME implementation. Signed-off-by: Jiang Liu Signed-off-by: Yijing Wang --- drivers/pci/pcie/pme.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c index 30897bf..74a3d4d 100644 --- a/drivers/pci/pcie/pme.c +++ b/drivers/pci/pcie/pme.c @@ -57,17 +57,13 @@ struct pcie_pme_service_data { */ void pcie_pme_interrupt_enable(struct pci_dev *dev, bool enable) { - int rtctl_pos; - u16 rtctl; + u16 set = 0, clr = 0; - rtctl_pos = pci_pcie_cap(dev) + PCI_EXP_RTCTL; - - pci_read_config_word(dev, rtctl_pos, &rtctl); if (enable) - rtctl |= PCI_EXP_RTCTL_PMEIE; + set = PCI_EXP_RTCTL_PMEIE; else - rtctl &= ~PCI_EXP_RTCTL_PMEIE; - pci_write_config_word(dev, rtctl_pos, rtctl); + clr = PCI_EXP_RTCTL_PMEIE; + pci_pcie_capability_change_word(dev, PCI_EXP_RTCTL, set, clr); } /** @@ -226,18 +222,15 @@ static void pcie_pme_work_fn(struct work_struct *work) struct pcie_pme_service_data *data = container_of(work, struct pcie_pme_service_data, work); struct pci_dev *port = data->srv->port; - int rtsta_pos; u32 rtsta; - rtsta_pos = pci_pcie_cap(port) + PCI_EXP_RTSTA; - spin_lock_irq(&data->lock); for (;;) { if (data->noirq) break; - pci_read_config_dword(port, rtsta_pos, &rtsta); + pci_pcie_capability_read_dword(port, PCI_EXP_RTSTA, &rtsta); if (rtsta & PCI_EXP_RTSTA_PME) { /* * Clear PME status of the port. If there are other @@ -276,17 +269,14 @@ static irqreturn_t pcie_pme_irq(int irq, void *context) { struct pci_dev *port; struct pcie_pme_service_data *data; - int rtsta_pos; u32 rtsta; unsigned long flags; port = ((struct pcie_device *)context)->port; data = get_service_data((struct pcie_device *)context); - rtsta_pos = pci_pcie_cap(port) + PCI_EXP_RTSTA; - spin_lock_irqsave(&data->lock, flags); - pci_read_config_dword(port, rtsta_pos, &rtsta); + pci_pcie_capability_read_dword(port, PCI_EXP_RTSTA, &rtsta); if (!(rtsta & PCI_EXP_RTSTA_PME)) { spin_unlock_irqrestore(&data->lock, flags);