Skip to content

Commit 363d53a

Browse files
Marek Vasutbjorn-helgaas
authored andcommitted
PCI: dwc: Silence 'set affinity failed' warning
Use MSI_FLAG_NO_AFFINITY, which keeps .irq_set_affinity() unset and allows migrate_one_irq() to exit right away, without warnings like this: IRQ...: set affinity failed(-22) Remove the .irq_set_affinity() implementation that is no longer needed. Link: https://lore.kernel.org/r/20240723132958.41320-6-marek.vasut+renesas@mailbox.org Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> [bhelgaas: commit log] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Acked-by: Thomas Gleixner <tglx@linutronix.de>
1 parent c7b10ed commit 363d53a

2 files changed

Lines changed: 3 additions & 16 deletions

File tree

drivers/pci/controller/dwc/pci-keystone.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,6 @@ static void ks_pcie_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
189189
(int)data->hwirq, msg->address_hi, msg->address_lo);
190190
}
191191

192-
static int ks_pcie_msi_set_affinity(struct irq_data *irq_data,
193-
const struct cpumask *mask, bool force)
194-
{
195-
return -EINVAL;
196-
}
197-
198192
static void ks_pcie_msi_mask(struct irq_data *data)
199193
{
200194
struct dw_pcie_rp *pp = irq_data_get_irq_chip_data(data);
@@ -247,7 +241,6 @@ static struct irq_chip ks_pcie_msi_irq_chip = {
247241
.name = "KEYSTONE-PCI-MSI",
248242
.irq_ack = ks_pcie_msi_irq_ack,
249243
.irq_compose_msi_msg = ks_pcie_compose_msi_msg,
250-
.irq_set_affinity = ks_pcie_msi_set_affinity,
251244
.irq_mask = ks_pcie_msi_mask,
252245
.irq_unmask = ks_pcie_msi_unmask,
253246
};

drivers/pci/controller/dwc/pcie-designware-host.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ static struct irq_chip dw_pcie_msi_irq_chip = {
4848
};
4949

5050
static struct msi_domain_info dw_pcie_msi_domain_info = {
51-
.flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
52-
MSI_FLAG_PCI_MSIX | MSI_FLAG_MULTI_PCI_MSI),
51+
.flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
52+
MSI_FLAG_NO_AFFINITY | MSI_FLAG_PCI_MSIX |
53+
MSI_FLAG_MULTI_PCI_MSI,
5354
.chip = &dw_pcie_msi_irq_chip,
5455
};
5556

@@ -116,12 +117,6 @@ static void dw_pci_setup_msi_msg(struct irq_data *d, struct msi_msg *msg)
116117
(int)d->hwirq, msg->address_hi, msg->address_lo);
117118
}
118119

119-
static int dw_pci_msi_set_affinity(struct irq_data *d,
120-
const struct cpumask *mask, bool force)
121-
{
122-
return -EINVAL;
123-
}
124-
125120
static void dw_pci_bottom_mask(struct irq_data *d)
126121
{
127122
struct dw_pcie_rp *pp = irq_data_get_irq_chip_data(d);
@@ -177,7 +172,6 @@ static struct irq_chip dw_pci_msi_bottom_irq_chip = {
177172
.name = "DWPCI-MSI",
178173
.irq_ack = dw_pci_bottom_ack,
179174
.irq_compose_msi_msg = dw_pci_setup_msi_msg,
180-
.irq_set_affinity = dw_pci_msi_set_affinity,
181175
.irq_mask = dw_pci_bottom_mask,
182176
.irq_unmask = dw_pci_bottom_unmask,
183177
};

0 commit comments

Comments
 (0)