From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 4 Aug 2022 16:41:51 +0000 (-0500)
Subject: Merge branch 'pci/enumeration'
X-Git-Tag: baikal/mips/sdk6.1~5130^2~25
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=d5dba1ca9942b61246b540cd87bd0fd7e9056a2d;p=kernel.git

Merge branch 'pci/enumeration'

- Split out ARI "next function" handling from the traditional one (Niklas
  Schnelle)

- Move jailhouse "isolated function" (non-zero functions where function 0
  doesn't exist) handling to pci_scan_slot() to avoid duplicating
  multi-function scanning in pci_scan_child_bus_extend() (Niklas Schnelle)

- Extend "isolated function" probing to s390 (Niklas Schnelle).

- Allow s390 zPCI zbus without a function 0 (Niklas Schnelle)

* pci/enumeration:
  s390/pci: allow zPCI zbus without a function zero
  PCI: Extend isolated function probing to s390
  PCI: Move jailhouse's isolated function handling to pci_scan_slot()
  PCI: Split out next_ari_fn() from next_fn()
  PCI: Clean up pci_scan_slot()
---

d5dba1ca9942b61246b540cd87bd0fd7e9056a2d