From: Huacai Chen <chenhuacai@loongson.cn>
To: Thomas Gleixner <tglx@linutronix.de>,
Marc Zyngier <maz@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn,
Xuefeng Li <lixuefeng@loongson.cn>,
Huacai Chen <chenhuacai@gmail.com>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
Huacai Chen <chenhuacai@loongson.cn>
Subject: [PATCH 1/2] genirq/msi, platform-msi: Adjust return value of msi_domain_prepare_irqs()
Date: Sat, 27 May 2023 13:46:32 +0800 [thread overview]
Message-ID: <20230527054633.704916-2-chenhuacai@loongson.cn> (raw)
In-Reply-To: <20230527054633.704916-1-chenhuacai@loongson.cn>
Adjust the return value semanteme of msi_domain_prepare_irqs(), which
allows us to modify the input nvec by overriding the msi_domain_ops::
msi_prepare(). This is necessary for the later patch.
Before:
0 on success, others on error.
After:
= 0: Success;
> 0: The modified nvec;
< 0: Error code.
Callers are also updated.
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
---
drivers/base/platform-msi.c | 2 +-
kernel/irq/msi.c | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c
index f37ad34c80ec..e4a517c144e7 100644
--- a/drivers/base/platform-msi.c
+++ b/drivers/base/platform-msi.c
@@ -298,7 +298,7 @@ __platform_msi_create_device_domain(struct device *dev,
platform_msi_set_proxy_dev(&data->arg);
err = msi_domain_prepare_irqs(domain->parent, dev, nvec, &data->arg);
- if (err)
+ if (err < 0)
goto free_domain;
return domain;
diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index 7a97bcb086bf..d151936aec05 100644
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -1058,6 +1058,12 @@ bool msi_match_device_irq_domain(struct device *dev, unsigned int domid,
return ret;
}
+/*
+ * Return Val:
+ * = 0: Success;
+ * > 0: The modified nvec;
+ * < 0: Error code.
+ */
int msi_domain_prepare_irqs(struct irq_domain *domain, struct device *dev,
int nvec, msi_alloc_info_t *arg)
{
@@ -1260,8 +1266,10 @@ static int __msi_domain_alloc_irqs(struct device *dev, struct irq_domain *domain
int i, ret, virq;
ret = msi_domain_prepare_irqs(domain, dev, ctrl->nirqs, &arg);
- if (ret)
+ if (ret < 0)
return ret;
+ if (ret > 0)
+ ctrl->nirqs = ret;
/*
* This flag is set by the PCI layer as we need to activate
--
2.39.1
next prev parent reply other threads:[~2023-05-27 5:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-27 5:46 [PATCH 0/2] Add machanism to limit msi allocation for Loongson Huacai Chen
2023-05-27 5:46 ` Huacai Chen [this message]
2023-05-27 14:03 ` [PATCH 1/2] genirq/msi, platform-msi: Adjust return value of msi_domain_prepare_irqs() Thomas Gleixner
2023-05-28 3:42 ` Huacai Chen
2023-05-29 7:44 ` Thomas Gleixner
2023-05-29 9:35 ` Huacai Chen
2023-05-28 7:47 ` Marc Zyngier
2023-05-28 12:07 ` Huacai Chen
2023-05-29 9:27 ` Thomas Gleixner
2023-05-29 9:36 ` Huacai Chen
2023-05-29 20:19 ` Thomas Gleixner
2023-05-30 8:34 ` Huacai Chen
2023-05-30 12:22 ` Thomas Gleixner
2023-05-30 15:03 ` Thomas Gleixner
2023-06-01 15:18 ` Huacai Chen
2023-06-02 1:10 ` bibo, mao
2023-05-27 5:46 ` [PATCH 2/2] irqchip/loongson-pch-msi: Add machanism to limit msi allocation Huacai Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230527054633.704916-2-chenhuacai@loongson.cn \
--to=chenhuacai@loongson.cn \
--cc=bhelgaas@google.com \
--cc=chenhuacai@gmail.com \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
--cc=loongson-kernel@lists.loongnix.cn \
--cc=maz@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.