From patchwork Wed Mar 27 09:05:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 231614 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 F0C0B2C00A5 for ; Wed, 27 Mar 2013 20:06:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753630Ab3C0JGK (ORCPT ); Wed, 27 Mar 2013 05:06:10 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:52688 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750874Ab3C0JGI (ORCPT ); Wed, 27 Mar 2013 05:06:08 -0400 Received: from 172.24.2.119 (EHLO szxeml212-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id AZS73638; Wed, 27 Mar 2013 17:06:01 +0800 (CST) Received: from SZXEML411-HUB.china.huawei.com (10.82.67.138) by szxeml212-edg.china.huawei.com (172.24.2.181) with Microsoft SMTP Server (TLS) id 14.1.323.7; Wed, 27 Mar 2013 17:06:00 +0800 Received: from localhost (10.135.76.69) by szxeml411-hub.china.huawei.com (10.82.67.138) with Microsoft SMTP Server id 14.1.323.7; Wed, 27 Mar 2013 17:05:53 +0800 From: Yijing Wang To: Alex Williamson CC: Bjorn Helgaas , , Arnd Bergmann , , Hanjun Guo , , Yijing Wang Subject: [PATCH] PCI/VFIO: use pcie_flags_reg instead of access PCI-E Capabilities Register Date: Wed, 27 Mar 2013 17:05:40 +0800 Message-ID: <1364375140-6388-1-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 MIME-Version: 1.0 X-Originating-IP: [10.135.76.69] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Currently, we use pcie_flags_reg to cache PCI-E Capabilities Register, because PCI-E Capabilities Register bits are almost read-only. This patch use pcie_flags_reg instead of another access PCI-E Capabilities Register. Signed-off-by: Yijing Wang --- drivers/vfio/pci/vfio_pci_config.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c index aeb00fc..afc6ca4 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c @@ -1017,13 +1017,9 @@ static int vfio_cap_len(struct vfio_pci_device *vdev, u8 cap, u8 pos) return byte; case PCI_CAP_ID_EXP: /* length based on version */ - ret = pci_read_config_word(pdev, pos + PCI_EXP_FLAGS, &word); - if (ret) - return pcibios_err_to_errno(ret); - vdev->extended_caps = true; - if ((word & PCI_EXP_FLAGS_VERS) == 1) + if ((pdev->pcie_flags_reg & PCI_EXP_FLAGS_VERS) == 1) return PCI_CAP_EXP_ENDPOINT_SIZEOF_V1; else return PCI_CAP_EXP_ENDPOINT_SIZEOF_V2;