| Message ID | 20240723132958.41320-6-marek.vasut+renesas@mailbox.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 363d53acbfd3ec0454349d1e312f600d3fa33285 |
| Delegated to: | Krzysztof Wilczyński |
| Headers | show |
| Series | genirq/msi: Silence set affinity failed warning | expand |
On 7/23/24 10:27 PM, Marek Vasut wrote: > Use newly introduced MSI_FLAG_NO_AFFINITY, which keeps .irq_set_affinity unset > and allows migrate_one_irq() code in cpuhotplug.c to exit right away, without > printing "IRQ...: set affinity failed(-22)" warning. > > Remove .irq_set_affinity implementation which only return -EINVAL from this > controller driver. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> Looks good to me. Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
On Tue, Jul 23, 2024 at 03:27:05PM +0200, Marek Vasut wrote: > Use newly introduced MSI_FLAG_NO_AFFINITY, which keeps .irq_set_affinity unset > and allows migrate_one_irq() code in cpuhotplug.c to exit right away, without > printing "IRQ...: set affinity failed(-22)" warning. > > Remove .irq_set_affinity implementation which only return -EINVAL from this > controller driver. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > --- > Cc: "Krzysztof Wilczyński" <kw@linux.com> > Cc: "Pali Rohár" <pali@kernel.org> > Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> > Cc: Aleksandr Mishin <amishin@t-argos.ru> > Cc: Anna-Maria Behnsen <anna-maria@linutronix.de> > Cc: Anup Patel <apatel@ventanamicro.com> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> > Cc: Daire McNamara <daire.mcnamara@microchip.com> > Cc: Damien Le Moal <dlemoal@kernel.org> > Cc: Florian Fainelli <florian.fainelli@broadcom.com> > Cc: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > Cc: Jianjun Wang <jianjun.wang@mediatek.com> > Cc: Jim Quinlan <jim2101024@gmail.com> > Cc: Jingoo Han <jingoohan1@gmail.com> > Cc: Jisheng Zhang <Jisheng.Zhang@synaptics.com> > Cc: Jon Hunter <jonathanh@nvidia.com> > Cc: Jonathan Derrick <jonathan.derrick@linux.dev> > Cc: Jonathan Hunter <jonathanh@nvidia.com> > Cc: Joyce Ooi <joyce.ooi@intel.com> > Cc: Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in> > Cc: Kishon Vijay Abraham I <kishon@kernel.org> > Cc: Koichiro Den <den@valinux.co.jp> > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> > Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Cc: Marc Zyngier <maz@kernel.org> > Cc: Michal Simek <michal.simek@amd.com> > Cc: Nicolas Saenz Julienne <nsaenz@kernel.org> > Cc: Niklas Cassel <cassel@kernel.org> > Cc: Nipun Gupta <nipun.gupta@amd.com> > Cc: Nirmal Patel <nirmal.patel@linux.intel.com> > Cc: Rob Herring <robh@kernel.org> > Cc: Ryder Lee <ryder.lee@mediatek.com> > Cc: Shivamurthy Shastri <shivamurthy.shastri@linutronix.de> > Cc: Siddharth Vadapalli <s-vadapalli@ti.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-mediatek@lists.infradead.org > Cc: linux-pci@vger.kernel.org > Cc: linux-renesas-soc@vger.kernel.org > Cc: linux-rpi-kernel@lists.infradead.org > Cc: linux-tegra@vger.kernel.org > --- > V4: - New patch > --- > drivers/pci/controller/dwc/pci-keystone.c | 7 ------- > drivers/pci/controller/dwc/pcie-designware-host.c | 12 +++--------- > 2 files changed, 3 insertions(+), 16 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c > index 52c6420ae2003..ce9d9e0a52609 100644 > --- a/drivers/pci/controller/dwc/pci-keystone.c > +++ b/drivers/pci/controller/dwc/pci-keystone.c > @@ -189,12 +189,6 @@ static void ks_pcie_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) > (int)data->hwirq, msg->address_hi, msg->address_lo); > } > > -static int ks_pcie_msi_set_affinity(struct irq_data *irq_data, > - const struct cpumask *mask, bool force) > -{ > - return -EINVAL; > -} > - > static void ks_pcie_msi_mask(struct irq_data *data) > { > 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 = { > .name = "KEYSTONE-PCI-MSI", > .irq_ack = ks_pcie_msi_irq_ack, > .irq_compose_msi_msg = ks_pcie_compose_msi_msg, > - .irq_set_affinity = ks_pcie_msi_set_affinity, > .irq_mask = ks_pcie_msi_mask, > .irq_unmask = ks_pcie_msi_unmask, > }; > diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c > index a0822d5371bc5..3e41865c72904 100644 > --- a/drivers/pci/controller/dwc/pcie-designware-host.c > +++ b/drivers/pci/controller/dwc/pcie-designware-host.c > @@ -48,8 +48,9 @@ static struct irq_chip dw_pcie_msi_irq_chip = { > }; > > static struct msi_domain_info dw_pcie_msi_domain_info = { > - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | > - MSI_FLAG_PCI_MSIX | MSI_FLAG_MULTI_PCI_MSI), > + .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | > + MSI_FLAG_NO_AFFINITY | MSI_FLAG_PCI_MSIX | > + MSI_FLAG_MULTI_PCI_MSI, > .chip = &dw_pcie_msi_irq_chip, > }; > > @@ -116,12 +117,6 @@ static void dw_pci_setup_msi_msg(struct irq_data *d, struct msi_msg *msg) > (int)d->hwirq, msg->address_hi, msg->address_lo); > } > > -static int dw_pci_msi_set_affinity(struct irq_data *d, > - const struct cpumask *mask, bool force) > -{ > - return -EINVAL; > -} > - > static void dw_pci_bottom_mask(struct irq_data *d) > { > 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 = { > .name = "DWPCI-MSI", > .irq_ack = dw_pci_bottom_ack, > .irq_compose_msi_msg = dw_pci_setup_msi_msg, > - .irq_set_affinity = dw_pci_msi_set_affinity, > .irq_mask = dw_pci_bottom_mask, > .irq_unmask = dw_pci_bottom_unmask, > }; > -- > 2.43.0 >
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index 52c6420ae2003..ce9d9e0a52609 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -189,12 +189,6 @@ static void ks_pcie_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) (int)data->hwirq, msg->address_hi, msg->address_lo); } -static int ks_pcie_msi_set_affinity(struct irq_data *irq_data, - const struct cpumask *mask, bool force) -{ - return -EINVAL; -} - static void ks_pcie_msi_mask(struct irq_data *data) { 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 = { .name = "KEYSTONE-PCI-MSI", .irq_ack = ks_pcie_msi_irq_ack, .irq_compose_msi_msg = ks_pcie_compose_msi_msg, - .irq_set_affinity = ks_pcie_msi_set_affinity, .irq_mask = ks_pcie_msi_mask, .irq_unmask = ks_pcie_msi_unmask, }; diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index a0822d5371bc5..3e41865c72904 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -48,8 +48,9 @@ static struct irq_chip dw_pcie_msi_irq_chip = { }; static struct msi_domain_info dw_pcie_msi_domain_info = { - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | - MSI_FLAG_PCI_MSIX | MSI_FLAG_MULTI_PCI_MSI), + .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | + MSI_FLAG_NO_AFFINITY | MSI_FLAG_PCI_MSIX | + MSI_FLAG_MULTI_PCI_MSI, .chip = &dw_pcie_msi_irq_chip, }; @@ -116,12 +117,6 @@ static void dw_pci_setup_msi_msg(struct irq_data *d, struct msi_msg *msg) (int)d->hwirq, msg->address_hi, msg->address_lo); } -static int dw_pci_msi_set_affinity(struct irq_data *d, - const struct cpumask *mask, bool force) -{ - return -EINVAL; -} - static void dw_pci_bottom_mask(struct irq_data *d) { 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 = { .name = "DWPCI-MSI", .irq_ack = dw_pci_bottom_ack, .irq_compose_msi_msg = dw_pci_setup_msi_msg, - .irq_set_affinity = dw_pci_msi_set_affinity, .irq_mask = dw_pci_bottom_mask, .irq_unmask = dw_pci_bottom_unmask, };
Use newly introduced MSI_FLAG_NO_AFFINITY, which keeps .irq_set_affinity unset and allows migrate_one_irq() code in cpuhotplug.c to exit right away, without printing "IRQ...: set affinity failed(-22)" warning. Remove .irq_set_affinity implementation which only return -EINVAL from this controller driver. Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> --- Cc: "Krzysztof Wilczyński" <kw@linux.com> Cc: "Pali Rohár" <pali@kernel.org> Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> Cc: Aleksandr Mishin <amishin@t-argos.ru> Cc: Anna-Maria Behnsen <anna-maria@linutronix.de> Cc: Anup Patel <apatel@ventanamicro.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> Cc: Daire McNamara <daire.mcnamara@microchip.com> Cc: Damien Le Moal <dlemoal@kernel.org> Cc: Florian Fainelli <florian.fainelli@broadcom.com> Cc: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> Cc: Jianjun Wang <jianjun.wang@mediatek.com> Cc: Jim Quinlan <jim2101024@gmail.com> Cc: Jingoo Han <jingoohan1@gmail.com> Cc: Jisheng Zhang <Jisheng.Zhang@synaptics.com> Cc: Jon Hunter <jonathanh@nvidia.com> Cc: Jonathan Derrick <jonathan.derrick@linux.dev> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: Joyce Ooi <joyce.ooi@intel.com> Cc: Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in> Cc: Kishon Vijay Abraham I <kishon@kernel.org> Cc: Koichiro Den <den@valinux.co.jp> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Cc: Marc Zyngier <maz@kernel.org> Cc: Michal Simek <michal.simek@amd.com> Cc: Nicolas Saenz Julienne <nsaenz@kernel.org> Cc: Niklas Cassel <cassel@kernel.org> Cc: Nipun Gupta <nipun.gupta@amd.com> Cc: Nirmal Patel <nirmal.patel@linux.intel.com> Cc: Rob Herring <robh@kernel.org> Cc: Ryder Lee <ryder.lee@mediatek.com> Cc: Shivamurthy Shastri <shivamurthy.shastri@linutronix.de> Cc: Siddharth Vadapalli <s-vadapalli@ti.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org Cc: linux-pci@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-tegra@vger.kernel.org --- V4: - New patch --- drivers/pci/controller/dwc/pci-keystone.c | 7 ------- drivers/pci/controller/dwc/pcie-designware-host.c | 12 +++--------- 2 files changed, 3 insertions(+), 16 deletions(-)