From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 23 Sep 2019 21:10:10 +0000 (-0500)
Subject: Merge branch 'pci/misc'
X-Git-Tag: v5.4-rc1~63^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ce54f0219c8794b603b0dea2673cfa1998a137c;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'pci/misc'

  - Use devm_add_action_or_reset() helper (Fuqian Huang)

  - Mark expected switch fall-through (Gustavo A. R. Silva)

  - Convert sysfs device attributes from __ATTR() to DEVICE_ATTR() (Kelsey
    Skunberg)

  - Convert sysfs file permissions from S_IRUSR etc to octal (Kelsey
    Skunberg)

  - Move SR-IOV sysfs functions to iov.c (Kelsey Skunberg)

  - Add pci_info_ratelimited() to ratelimit PCI messages separately
    (Krzysztof Wilczynski)

  - Fix "'static' not at beginning of declaration" warnings (Krzysztof
    Wilczynski)

  - Clean up resource_alignment parameter to not require static buffer
    (Logan Gunthorpe)

  - Add ACS quirk for iProc PAXB (Abhinav Ratna)

  - Add pci_irq_vector() and other stubs for !CONFIG_PCI (Herbert Xu)

* pci/misc:
  PCI: Add pci_irq_vector() and other stubs when !CONFIG_PCI
  PCI: Add ACS quirk for iProc PAXB
  PCI: Force trailing new line to resource_alignment_param in sysfs
  PCI: Move pci_[get|set]_resource_alignment_param() into their callers
  PCI: Clean up resource_alignment parameter to not require static buffer
  PCI: Use static const struct, not const static struct
  PCI: Add pci_info_ratelimited() to ratelimit PCI separately
  PCI/IOV: Remove group write permission from sriov_numvfs, sriov_drivers_autoprobe
  PCI/IOV: Move sysfs SR-IOV functions to iov.c
  PCI: sysfs: Change permissions from symbolic to octal
  PCI: sysfs: Change DEVICE_ATTR() to DEVICE_ATTR_WO()
  PCI: sysfs: Define device attributes with DEVICE_ATTR*()
  PCI: Mark expected switch fall-through
  PCI: Use devm_add_action_or_reset()
---

6ce54f0219c8794b603b0dea2673cfa1998a137c
diff --cc include/linux/pci.h
index 9035964,23e4a6b..74bcbb3
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -1759,10 -1772,32 +1751,31 @@@ static inline const struct pci_device_i
  							 struct pci_dev *dev)
  { return NULL; }
  static inline bool pci_ats_disabled(void) { return true; }
+ 
+ static inline int pci_irq_vector(struct pci_dev *dev, unsigned int nr)
+ {
+ 	return -EINVAL;
+ }
+ 
+ static inline int
+ pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
+ 			       unsigned int max_vecs, unsigned int flags,
+ 			       struct irq_affinity *aff_desc)
+ {
+ 	return -ENOSPC;
+ }
  #endif /* CONFIG_PCI */
  
+ static inline int
+ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,
+ 		      unsigned int max_vecs, unsigned int flags)
+ {
+ 	return pci_alloc_irq_vectors_affinity(dev, min_vecs, max_vecs, flags,
+ 					      NULL);
+ }
+ 
  #ifdef CONFIG_PCI_ATS
  /* Address Translation Service */
 -void pci_ats_init(struct pci_dev *dev);
  int pci_enable_ats(struct pci_dev *dev, int ps);
  void pci_disable_ats(struct pci_dev *dev);
  int pci_ats_queue_depth(struct pci_dev *dev);