From: Sinan Kaya <okaya@kernel.org>
To: linux-pci@vger.kernel.org
Cc: Sinan Kaya <okaya@kernel.org>,
Mike Marciniszyn <mike.marciniszyn@intel.com>,
Dennis Dalessandro <dennis.dalessandro@intel.com>,
Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
Derek Chickles <derek.chickles@caviumnetworks.com>,
Satanand Burla <satananda.burla@caviumnetworks.com>,
Felix Manlunas <felix.manlunas@caviumnetworks.com>,
Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>,
"David S. Miller" <davem@davemloft.net>,
Bjorn Helgaas <bhelgaas@google.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Juergen Gross <jgross@suse.com>,
Jia-Ju Bai <baijiaju1990@gmail.com>
Subject: [PATCH v5 10/11] PCI: Hide pci_reset_function_locked()
Date: Thu, 11 Oct 2018 04:50:02 +0000 [thread overview]
Message-ID: <20181011045008.32212-10-okaya@kernel.org> (raw)
In-Reply-To: <20181011045008.32212-1-okaya@kernel.org>
It is time to hide pci_reset_function_locked() since pci_reset_function()
provides the same functionality. One less API to expose to the users.
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
drivers/infiniband/hw/hfi1/pcie.c | 2 +-
drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +-
drivers/pci/pci.h | 2 ++
drivers/xen/xen-pciback/pci_stub.c | 6 +++---
include/linux/pci.h | 2 --
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c
index 73eced9c5523..8fbcde36353d 100644
--- a/drivers/infiniband/hw/hfi1/pcie.c
+++ b/drivers/infiniband/hw/hfi1/pcie.c
@@ -897,7 +897,7 @@ static int trigger_sbr(struct hfi1_devdata *dd)
* to be implemented to have cleaner interface but this fixes the
* current brokenness
*/
- return pci_reset_function_locked(dev, PCI_RESET_LINK, false);
+ return pci_reset_function(dev, PCI_RESET_LINK, false, true);
}
/*
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 7e001382ad93..e1ff9818ed6b 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -989,7 +989,7 @@ static void octeon_pci_flr(struct octeon_device *oct)
pci_write_config_word(oct->pci_dev, PCI_COMMAND,
PCI_COMMAND_INTX_DISABLE);
- rc = pci_reset_function_locked(oct->pci_dev, PCI_RESET_ANY, false);
+ rc = pci_reset_function(oct->pci_dev, PCI_RESET_ANY, false, true);
if (rc != 0)
dev_err(&oct->pci_dev->dev, "Error %d resetting PCI function %d\n",
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index fbfb44fb32b7..737fdc36fe36 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -36,6 +36,8 @@ int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vmai,
int pci_probe_reset_function(struct pci_dev *dev, u32 reset_type);
int pci_bridge_secondary_bus_reset(struct pci_dev *dev);
int __pci_reset_function_locked(struct pci_dev *dev, u32 reset_type);
+int pci_reset_function_locked(struct pci_dev *dev, u32 reset_type,
+ bool saverestore);
/**
* struct pci_platform_pm_ops - Firmware PM callbacks
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c
index b68e811ab27f..6806a58c30d5 100644
--- a/drivers/xen/xen-pciback/pci_stub.c
+++ b/drivers/xen/xen-pciback/pci_stub.c
@@ -105,7 +105,7 @@ static void pcistub_device_release(struct kref *kref)
/* Call the reset function which does not take lock as this
* is called from "unbind" which takes a device_lock mutex.
*/
- pci_reset_function_locked(dev, PCI_RESET_ANY, false);
+ pci_reset_function(dev, PCI_RESET_ANY, false, true);
if (pci_load_and_free_saved_state(dev, &dev_data->pci_saved_state))
dev_info(&dev->dev, "Could not reload PCI state\n");
else
@@ -283,7 +283,7 @@ void pcistub_put_pci_dev(struct pci_dev *dev)
* (so it's ready for the next domain)
*/
device_lock_assert(&dev->dev);
- pci_reset_function_locked(dev, PCI_RESET_ANY, false);
+ pci_reset_function(dev, PCI_RESET_ANY, false, true);
dev_data = pci_get_drvdata(dev);
ret = pci_load_saved_state(dev, dev_data->pci_saved_state);
@@ -417,7 +417,7 @@ static int pcistub_init_device(struct pci_dev *dev)
dev_err(&dev->dev, "Could not store PCI conf saved state!\n");
else {
dev_dbg(&dev->dev, "resetting (FLR, D3, etc) the device\n");
- pci_reset_function_locked(dev, PCI_RESET_ANY, false);
+ pci_reset_function(dev, PCI_RESET_ANY, false, true);
pci_restore_state(dev);
}
/* Now disable the device (this also ensures some private device
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 82b326eb624b..95efffd09690 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1167,8 +1167,6 @@ bool pcie_has_flr(struct pci_dev *dev);
int pcie_flr(struct pci_dev *dev);
int pci_reset_function(struct pci_dev *dev, u32 reset_type, bool saverestore,
bool locked);
-int pci_reset_function_locked(struct pci_dev *dev, u32 reset_type,
- bool saverestore);
int pci_try_reset_function(struct pci_dev *dev, u32 reset_type);
int pci_probe_reset_slot(struct pci_slot *slot);
int pci_probe_reset_bus(struct pci_bus *bus);
--
2.19.0
next prev parent reply other threads:[~2018-10-11 4:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 4:49 [PATCH v5 01/11] PCI: Expose reset_type to users of __pci_reset_function_locked() Sinan Kaya
2018-10-11 4:49 ` [PATCH v5 02/11] PCI: Expose reset_type to users of pci_reset_function() Sinan Kaya
2018-10-11 4:49 ` [PATCH v5 03/11] PCI: Expose reset_type to users of pci_reset_function_locked() Sinan Kaya
2018-10-11 4:49 ` [PATCH v5 04/11] PCI: Expose reset type to users of pci_try_reset_function() Sinan Kaya
2018-10-11 4:49 ` [PATCH v5 05/11] PCI: Expose reset type to users of pci_probe_reset_function() Sinan Kaya
2018-10-11 4:49 ` [PATCH v5 06/11] PCI: Expose reset type to users of pci_reset_bus() Sinan Kaya
2018-10-11 15:33 ` Alex Williamson
2018-10-11 15:36 ` Sinan Kaya
2018-10-11 4:49 ` [PATCH v5 07/11] IB/hfi1,PCI: switch to __pci_function_locked() for reset request Sinan Kaya
2018-10-11 4:50 ` [PATCH v5 08/11] PCI: Unify pci_reset_function_locked() and __pci_reset_function_locked() Sinan Kaya
2018-10-11 16:02 ` Alex Williamson
2018-10-11 16:11 ` Sinan Kaya
2018-10-12 9:18 ` Christoph Hellwig
2018-10-12 14:46 ` Sinan Kaya
2018-10-11 4:50 ` [PATCH v5 09/11] PCI: Add options to pci_reset_function Sinan Kaya
2018-10-12 9:18 ` Christoph Hellwig
2018-10-11 4:50 ` Sinan Kaya [this message]
2018-10-11 4:50 ` [PATCH v5 11/11] PCI: Hide pcie_flr() in favor of pci_reset_function() Sinan Kaya
2018-10-11 15:41 ` Sinan Kaya
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=20181011045008.32212-10-okaya@kernel.org \
--to=okaya@kernel.org \
--cc=baijiaju1990@gmail.com \
--cc=bhelgaas@google.com \
--cc=boris.ostrovsky@oracle.com \
--cc=davem@davemloft.net \
--cc=dennis.dalessandro@intel.com \
--cc=derek.chickles@caviumnetworks.com \
--cc=dledford@redhat.com \
--cc=felix.manlunas@caviumnetworks.com \
--cc=jgg@ziepe.ca \
--cc=jgross@suse.com \
--cc=linux-pci@vger.kernel.org \
--cc=mike.marciniszyn@intel.com \
--cc=raghu.vatsavayi@caviumnetworks.com \
--cc=satananda.burla@caviumnetworks.com \
/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).