Skip to content

Commit 372c669

Browse files
committed
Revert "PCI/MSI: Provide stubs for IMS functions"
This reverts commit 41efa43. IMS (Interrupt Message Store) support appeared in v6.2, but there are no users yet. Remove it for now. We can add it back when a user comes along. If this is re-added later, this could be squashed with these commits: 0194425 ("PCI/MSI: Provide IMS (Interrupt Message Store) support") c9e5bea ("PCI/MSI: Provide pci_ims_alloc/free_irq()") which added the non-stub implementations. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Kevin Tian <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]>
1 parent 4cece76 commit 372c669

File tree

1 file changed

+8
-26
lines changed

1 file changed

+8
-26
lines changed

include/linux/pci.h

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,8 +1658,6 @@ struct msix_entry {
16581658
u16 entry; /* Driver uses to specify entry, OS writes */
16591659
};
16601660

1661-
struct msi_domain_template;
1662-
16631661
#ifdef CONFIG_PCI_MSI
16641662
int pci_msi_vec_count(struct pci_dev *dev);
16651663
void pci_disable_msi(struct pci_dev *dev);
@@ -1692,11 +1690,6 @@ void pci_msix_free_irq(struct pci_dev *pdev, struct msi_map map);
16921690
void pci_free_irq_vectors(struct pci_dev *dev);
16931691
int pci_irq_vector(struct pci_dev *dev, unsigned int nr);
16941692
const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);
1695-
bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,
1696-
unsigned int hwsize, void *data);
1697-
struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,
1698-
const struct irq_affinity_desc *affdesc);
1699-
void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);
17001693

17011694
#else
17021695
static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
@@ -1760,25 +1753,6 @@ static inline const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev,
17601753
{
17611754
return cpu_possible_mask;
17621755
}
1763-
1764-
static inline bool pci_create_ims_domain(struct pci_dev *pdev,
1765-
const struct msi_domain_template *template,
1766-
unsigned int hwsize, void *data)
1767-
{ return false; }
1768-
1769-
static inline struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev,
1770-
union msi_instance_cookie *icookie,
1771-
const struct irq_affinity_desc *affdesc)
1772-
{
1773-
struct msi_map map = { .index = -ENOSYS, };
1774-
1775-
return map;
1776-
}
1777-
1778-
static inline void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map)
1779-
{
1780-
}
1781-
17821756
#endif
17831757

17841758
/**
@@ -2690,6 +2664,14 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev)
26902664
void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type);
26912665
#endif
26922666

2667+
struct msi_domain_template;
2668+
2669+
bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,
2670+
unsigned int hwsize, void *data);
2671+
struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,
2672+
const struct irq_affinity_desc *affdesc);
2673+
void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);
2674+
26932675
#include <linux/dma-mapping.h>
26942676

26952677
#define pci_printk(level, pdev, fmt, arg...) \

0 commit comments

Comments
 (0)