From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgw.gov.kz (mgw.gov.kz [89.218.88.242]) by dpdk.org (Postfix) with ESMTP id 17985B361 for ; Mon, 21 Jul 2014 14:03:05 +0200 (CEST) Received: from mgw.gov.kz (mx.ctsat.kz [178.89.4.95]) by mgw.gov.kz with ESMTP id s6LC4IXJ031828-s6LC4IXK031828; Mon, 21 Jul 2014 18:04:18 +0600 Received: from EXCASHUB1.rgp.local (192.168.40.51) by EdgeForefront.rgp.local (192.168.40.59) with Microsoft SMTP Server (TLS) id 14.2.247.3; Mon, 21 Jul 2014 18:03:55 +0600 Received: from deb-dpdk.rgp.local (192.168.35.15) by excashub1.rgp.local (192.168.40.48) with Microsoft SMTP Server (TLS) id 14.2.247.3; Mon, 21 Jul 2014 18:07:11 +0600 From: Yerden Zhumabekov To: Date: Mon, 21 Jul 2014 18:03:54 +0600 Message-ID: <1405944234-50272-4-git-send-email-e_zhumabekov@sts.kz> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405944234-50272-1-git-send-email-e_zhumabekov@sts.kz> References: <2795655.Wj4j2zIbVg@xps13> <1405944234-50272-1-git-send-email-e_zhumabekov@sts.kz> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.35.15] X-FEAS-SYSTEM-WL: e_zhumabekov@sts.kz Subject: [dpdk-dev] [igb_uio PATCH 3/3] igb_uio: renaming pci config lock/unlock functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jul 2014 12:03:06 -0000 renaming pci config lock/unlock functions using wrappers introduced in commit f57049874f61046641a8eb1e9832810cc33befe5 Signed-off-by: Yerden Zhumabekov --- lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c index 605410e..418bfa2 100644 --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c @@ -148,11 +148,11 @@ store_extended_tag(struct device *dev, else return -EINVAL; - pci_cfg_access_lock(pci_dev); + pci_config_lock(pci_dev); pci_bus_read_config_dword(pci_dev->bus, pci_dev->devfn, PCI_DEV_CAP_REG, &val); if (!(val & PCI_DEV_CAP_EXT_TAG_MASK)) { /* Not supported */ - pci_cfg_access_unlock(pci_dev); + pci_config_unlock(pci_dev); return -EPERM; } @@ -165,7 +165,7 @@ store_extended_tag(struct device *dev, val &= ~PCI_DEV_CTRL_EXT_TAG_MASK; pci_bus_write_config_dword(pci_dev->bus, pci_dev->devfn, PCI_DEV_CTRL_REG, val); - pci_cfg_access_unlock(pci_dev); + pci_config_unlock(pci_dev); return count; } @@ -252,7 +252,7 @@ static bool pci_intx_mask_supported(struct pci_dev *pdev) bool mask_supported = false; uint16_t orig, new; - pci_block_user_cfg_access(pdev); + pci_config_lock(pdev); pci_read_config_word(pdev, PCI_COMMAND, &orig); pci_write_config_word(pdev, PCI_COMMAND, orig ^ PCI_COMMAND_INTX_DISABLE); @@ -265,7 +265,7 @@ static bool pci_intx_mask_supported(struct pci_dev *pdev) mask_supported = true; pci_write_config_word(pdev, PCI_COMMAND, orig); } - pci_unblock_user_cfg_access(pdev); + pci_config_unlock(pdev); return mask_supported; } @@ -275,7 +275,7 @@ static bool pci_check_and_mask_intx(struct pci_dev *pdev) bool pending; uint32_t status; - pci_block_user_cfg_access(pdev); + pci_config_lock(pdev); pci_read_config_dword(pdev, PCI_COMMAND, &status); /* interrupt is not ours, goes to out */ @@ -292,7 +292,7 @@ static bool pci_check_and_mask_intx(struct pci_dev *pdev) if (old != new) pci_write_config_word(pdev, PCI_COMMAND, new); } - pci_unblock_user_cfg_access(pdev); + pci_config_unlock(pdev); return pending; } @@ -357,7 +357,7 @@ igbuio_pci_irqcontrol(struct uio_info *info, s32 irq_state) struct rte_uio_pci_dev *udev = igbuio_get_uio_pci_dev(info); struct pci_dev *pdev = udev->pdev; - pci_cfg_access_lock(pdev); + pci_config_lock(pdev); if (udev->mode == RTE_INTR_MODE_LEGACY) pci_intx(pdev, !!irq_state); else if (udev->mode == RTE_INTR_MODE_MSI) { @@ -370,7 +370,7 @@ igbuio_pci_irqcontrol(struct uio_info *info, s32 irq_state) list_for_each_entry(desc, &pdev->msi_list, list) igbuio_msix_mask_irq(desc, irq_state); } - pci_cfg_access_unlock(pdev); + pci_config_unlock(pdev); return 0; } -- 1.7.10.4