Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Raphael Norwitz <raphael.norwitz@nutanix.com>
To:     "bhelgaas@google.com" <bhelgaas@google.com>
CC:     "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "alex.williamson@redhat.com" <alex.williamson@redhat.com>,
        "ameynarkhede03@gmail.com" <ameynarkhede03@gmail.com>,
        Raphael Norwitz <raphael.norwitz@nutanix.com>
Subject: [PATCH v2] PCI: merge slot and bus reset implementations
Thread-Topic: [PATCH v2] PCI: merge slot and bus reset implementations
Thread-Index: AQHXLKRMegmdSIbwh0yUAOjSYPt99g==
Date:   Thu, 8 Apr 2021 18:23:40 +0000
Message-ID: <20210408182328.12323-1-raphael.norwitz@nutanix.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: d8df34df-1938-410d-688d-08d8fabb6f76
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Apr 2021 18:23:40.7585
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: VTNdPa3nCk+Tsr1UDLzBmf/fvRC8I3ayfcV90DSLP4wL3FguT6W8wpchePH2EnATVAoc/G9SWJjCLysgRbFv3vFxWaKddgDLzwcJX5MCViA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR02MB4942
X-Proofpoint-ORIG-GUID: 2gUrDDLyTDSiwx3MIudJEvKeefsyvdzK
X-Proofpoint-GUID: 2gUrDDLyTDSiwx3MIudJEvKeefsyvdzK
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761
 definitions=2021-04-08_04:2021-04-08,2021-04-08 signatures=0
X-Proofpoint-Spam-Reason: safe
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Slot resets are bus resets with additional logic to prevent a device
from being removed during the reset. Currently slot and bus resets have
separate implementations in pci.c, complicating higher level logic. As
discussed on the mailing list, they should be combined into a generic
function which performs an SBR. This change adds a function,
pci_reset_bus_function(), which first attempts a slot reset and then
attempts a bus reset if -ENOTTY is returned, such that there is now a
single device agnostic function to perform an SBR.

This new function is also needed to add SBR reset quirks and therefore
is exposed in pci.h.

Link: https://lkml.org/lkml/2021/3/23/911

Suggested-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Amey Narkhede <ameynarkhede03@gmail.com>
Signed-off-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
---
 drivers/pci/pci.c   | 19 +++++++++++--------
 include/linux/pci.h |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 16a17215f633..a8f8dd588d15 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4982,6 +4982,15 @@ static int pci_dev_reset_slot_function(struct pci_de=
v *dev, int probe)
 	return pci_reset_hotplug_slot(dev->slot->hotplug, probe);
 }
=20
+int pci_reset_bus_function(struct pci_dev *dev, int probe)
+{
+	int rc =3D pci_dev_reset_slot_function(dev, probe);
+
+	if (rc !=3D -ENOTTY)
+		return rc;
+	return pci_parent_bus_reset(dev, probe);
+}
+
 static void pci_dev_lock(struct pci_dev *dev)
 {
 	pci_cfg_access_lock(dev);
@@ -5102,10 +5111,7 @@ int __pci_reset_function_locked(struct pci_dev *dev)
 	rc =3D pci_pm_reset(dev, 0);
 	if (rc !=3D -ENOTTY)
 		return rc;
-	rc =3D pci_dev_reset_slot_function(dev, 0);
-	if (rc !=3D -ENOTTY)
-		return rc;
-	return pci_parent_bus_reset(dev, 0);
+	return pci_reset_bus_function(dev, 0);
 }
 EXPORT_SYMBOL_GPL(__pci_reset_function_locked);
=20
@@ -5135,13 +5141,10 @@ int pci_probe_reset_function(struct pci_dev *dev)
 	if (rc !=3D -ENOTTY)
 		return rc;
 	rc =3D pci_pm_reset(dev, 1);
-	if (rc !=3D -ENOTTY)
-		return rc;
-	rc =3D pci_dev_reset_slot_function(dev, 1);
 	if (rc !=3D -ENOTTY)
 		return rc;
=20
-	return pci_parent_bus_reset(dev, 1);
+	return pci_reset_bus_function(dev, 1);
 }
=20
 /**
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 86c799c97b77..979d54335ac1 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1228,6 +1228,7 @@ int pci_probe_reset_bus(struct pci_bus *bus);
 int pci_reset_bus(struct pci_dev *dev);
 void pci_reset_secondary_bus(struct pci_dev *dev);
 void pcibios_reset_secondary_bus(struct pci_dev *dev);
+int pci_reset_bus_function(struct pci_dev *dev, int probe);
 void pci_update_resource(struct pci_dev *dev, int resno);
 int __must_check pci_assign_resource(struct pci_dev *dev, int i);
 int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resourc=
e_size_t add_size, resource_size_t align);
--=20
2.20.1