DPDK patches and discussions
 help / color / mirror / Atom feed
From: Yerden Zhumabekov <e_zhumabekov@sts.kz>
To: <dev@dpdk.org>
Subject: [dpdk-dev] [igb_uio PATCH 3/3] igb_uio: renaming pci config lock/unlock functions
Date: Mon, 21 Jul 2014 18:03:54 +0600	[thread overview]
Message-ID: <1405944234-50272-4-git-send-email-e_zhumabekov@sts.kz> (raw)
In-Reply-To: <1405944234-50272-1-git-send-email-e_zhumabekov@sts.kz>

renaming pci config lock/unlock functions using wrappers introduced
in commit f57049874f61046641a8eb1e9832810cc33befe5

Signed-off-by: Yerden Zhumabekov <e_zhumabekov@sts.kz>
---
 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

  parent reply	other threads:[~2014-07-21 12:03 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-18 16:14 [dpdk-dev] [PATCH 00/10] igb_uio related patches Stephen Hemminger
2014-07-18 16:14 ` [dpdk-dev] [PATCH 01/10] igb_uio: use kernel standard log message Stephen Hemminger
2014-07-18 16:14 ` [dpdk-dev] [PATCH 02/10] igb_uio: use standard uio naming Stephen Hemminger
2014-07-18 16:14 ` [dpdk-dev] [PATCH 03/10] igb_uio: dont wrap pci_num_vf function needlessly Stephen Hemminger
2014-07-23  8:20   ` Thomas Monjalon
2014-07-18 16:14 ` [dpdk-dev] [PATCH 04/10] igb_uio: msix cleanups Stephen Hemminger
2014-07-18 16:14 ` [dpdk-dev] [PATCH 05/10] igb_uio: propogate error numbers in probe code Stephen Hemminger
2014-07-18 16:14 ` [dpdk-dev] [PATCH 06/10] igb_uio: make irq mode param read-only Stephen Hemminger
2014-07-18 16:14 ` [dpdk-dev] [PATCH 07/10] igb_uio: fix IRQ mode handling Stephen Hemminger
2014-07-18 16:14 ` [dpdk-dev] [PATCH 08/10] igb_uio: add missing locking to config access Stephen Hemminger
2014-07-18 16:14 ` [dpdk-dev] [PATCH 09/10] igb_uio: allow msi mode Stephen Hemminger
2014-07-18 16:14 ` [dpdk-dev] [PATCH 10/10] igb_uio: fix check patch warnings Stephen Hemminger
2014-07-19  0:16 ` [dpdk-dev] [PATCH 00/10] igb_uio related patches Thomas Monjalon
2014-07-20  8:14   ` Yerden Zhumabekov
2014-07-21 10:28     ` Thomas Monjalon
2014-07-21 12:03       ` [dpdk-dev] [igb_uio PATCH 0/3] igb_uio: fixed typos and pci lock/unlock calls Yerden Zhumabekov
2014-07-21 12:03         ` [dpdk-dev] [igb_uio PATCH 1/3] igb_uio: fixed typos Yerden Zhumabekov
2014-07-21 12:03         ` [dpdk-dev] [igb_uio PATCH 2/3] igb_uio: pci_config_lock/pci_config_unlock wrappers Yerden Zhumabekov
2014-07-21 20:42           ` Stephen Hemminger
2014-07-21 20:50             ` Thomas Monjalon
2014-07-22 12:57             ` Thomas Monjalon
2014-07-21 12:03         ` Yerden Zhumabekov [this message]
2014-07-21 19:51         ` [dpdk-dev] [igb_uio PATCH 0/3] igb_uio: fixed typos and pci lock/unlock calls Thomas Monjalon
2014-07-22 13:07         ` Thomas Monjalon
2014-07-24 21:50           ` Thomas Monjalon
2014-07-25 16:51             ` Stephen Hemminger
2014-07-21 15:38       ` [dpdk-dev] [PATCH " Yerden Zhumabekov
2014-07-21 15:38         ` [dpdk-dev] [PATCH 1/3] igb_uio: fixed typos Yerden Zhumabekov
2014-07-21 15:38         ` [dpdk-dev] [PATCH 2/3] igb_uio: pci_config_lock/pci_config_unlock wrappers Yerden Zhumabekov
2014-07-21 15:38         ` [dpdk-dev] [PATCH 3/3] igb_uio: renaming pci config lock/unlock functions Yerden Zhumabekov
2014-07-21 19:54         ` [dpdk-dev] [PATCH 0/3] igb_uio: fixed typos and pci lock/unlock calls Thomas Monjalon

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=1405944234-50272-4-git-send-email-e_zhumabekov@sts.kz \
    --to=e_zhumabekov@sts.kz \
    --cc=dev@dpdk.org \
    /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;
as well as URLs for NNTP newsgroup(s).