From patchwork Tue Jul 10 15:54:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1178171 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id F1375402D2 for ; Tue, 10 Jul 2012 15:57:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756022Ab2GJP4C (ORCPT ); Tue, 10 Jul 2012 11:56:02 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:43454 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752464Ab2GJP4A (ORCPT ); Tue, 10 Jul 2012 11:56:00 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so456687pbb.19 for ; Tue, 10 Jul 2012 08:56:00 -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 :in-reply-to:references; bh=LD6AZ0+K9+jswlMrONNhaj+UlKgOQC/l1Ra4SycISB4=; b=lzr2D3cvmsUGwQh4jDgWBCIKbQFjB3dhw3R0fy1HMVjZ9eSQ2PRyzSrMqz04Jo0V7R L+iA4VO+PyOGxsmQoOgrdNdWZT/shWqpYFOavfdAkO2KcbOSh2Wpw2ORwJebNxET2BCP wsMfzoBrBlt9RU7YP3Ig4cbA4kUjqKwdUKegz3Qir0qZgGxpTpATvT5NknEmFSUVMz0z 9ryEfuOl7XFcWwU/a6pKWZcfb+158hlygI48AVznP1Klqh0CQezO04j+sEuEWrmaKlhs pRvut/gKKQvu8czXQ5oTTi0o3/58FHAh3O2tf4vVXr8mkp429YV4sfUmH6VyOrE4y+6r xktw== Received: by 10.68.229.2 with SMTP id sm2mr33166169pbc.57.1341935760131; Tue, 10 Jul 2012 08:56:00 -0700 (PDT) Received: from localhost.localdomain ([221.221.21.23]) by mx.google.com with ESMTPS id oq4sm3056662pbb.21.2012.07.10.08.55.51 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Jul 2012 08:55:59 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Don Dutile Cc: Jiang Liu , Yinghai Lu , Taku Izumi , "Rafael J . Wysocki" , Kenji Kaneshige , Yijing Wang , Keping Chen , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [RFC PATCH 08/14] portdrv/PCI: use PCIe cap access functions to simplify implementation Date: Tue, 10 Jul 2012 23:54:09 +0800 Message-Id: <1341935655-5381-9-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341935655-5381-1-git-send-email-jiang.liu@huawei.com> References: <1341935655-5381-1-git-send-email-jiang.liu@huawei.com> In-Reply-To: References: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu Use PCIe cap access functions to simplify PCIe portdrv implementation Signed-off-by: Jiang Liu Signed-off-by: Yijing Wang --- drivers/pci/pcie/portdrv_core.c | 20 +++++++------------- drivers/pci/pcie/portdrv_pci.c | 7 ++----- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index bf320a9..a083e81 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c @@ -76,7 +76,6 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask) struct msix_entry *msix_entries; int idx[PCIE_PORT_DEVICE_MAXSERVICES]; int nr_entries, status, pos, i, nvec; - u16 reg16; u32 reg32; nr_entries = pci_msix_table_size(dev); @@ -120,9 +119,7 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask) * the value in this field indicates which MSI-X Table entry is * used to generate the interrupt message." */ - pos = pci_pcie_cap(dev); - pci_read_config_word(dev, pos + PCI_EXP_FLAGS, ®16); - entry = (reg16 & PCI_EXP_FLAGS_IRQ) >> 9; + entry = (dev->pcie_flags & PCI_EXP_FLAGS_IRQ) >> 9; if (entry >= nr_entries) goto Error; @@ -246,7 +243,7 @@ static void cleanup_service_irqs(struct pci_dev *dev) */ static int get_port_device_capability(struct pci_dev *dev) { - int services = 0, pos; + int services = 0; u16 reg16; u32 reg32; int cap_mask = 0; @@ -265,11 +262,9 @@ static int get_port_device_capability(struct pci_dev *dev) return 0; } - pos = pci_pcie_cap(dev); - pci_read_config_word(dev, pos + PCI_EXP_FLAGS, ®16); /* Hot-Plug Capable */ - if ((cap_mask & PCIE_PORT_SERVICE_HP) && (reg16 & PCI_EXP_FLAGS_SLOT)) { - pci_read_config_dword(dev, pos + PCI_EXP_SLTCAP, ®32); + if ((cap_mask & PCIE_PORT_SERVICE_HP) && + !pci_pcie_cap_read_dword(dev, PCI_EXP_SLTCAP, ®32)) if (reg32 & PCI_EXP_SLTCAP_HPC) { services |= PCIE_PORT_SERVICE_HP; /* @@ -277,12 +272,11 @@ static int get_port_device_capability(struct pci_dev *dev) * enabled by the BIOS and the hot-plug service driver * is not loaded. */ - pos += PCI_EXP_SLTCTL; - pci_read_config_word(dev, pos, ®16); + pci_pcie_cap_read_word(dev, PCI_EXP_SLTCTL, ®16); reg16 &= ~(PCI_EXP_SLTCTL_CCIE | PCI_EXP_SLTCTL_HPIE); - pci_write_config_word(dev, pos, reg16); + pci_pcie_cap_write_word(dev, PCI_EXP_SLTCTL, reg16); } - } + /* AER capable */ if ((cap_mask & PCIE_PORT_SERVICE_AER) && pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR)) { diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 24d1463..3b2c92d 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c @@ -64,14 +64,11 @@ __setup("pcie_ports=", pcie_port_setup); */ void pcie_clear_root_pme_status(struct pci_dev *dev) { - int rtsta_pos; u32 rtsta; - rtsta_pos = pci_pcie_cap(dev) + PCI_EXP_RTSTA; - - pci_read_config_dword(dev, rtsta_pos, &rtsta); + pci_pcie_cap_read_dword(dev, PCI_EXP_RTSTA, &rtsta); rtsta |= PCI_EXP_RTSTA_PME; - pci_write_config_dword(dev, rtsta_pos, rtsta); + pci_pcie_cap_write_dword(dev, PCI_EXP_RTSTA, rtsta); } static int pcie_portdrv_restore_config(struct pci_dev *dev)