From: Madalin Bucur <madalin.bucur@nxp.com>
To: leoyang.li@nxp.com
Cc: roy.pledge@nxp.com, claudiu.manoil@nxp.com,
catalin.marinas@arm.com, oss@buserror.net,
linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
Madalin Bucur <madalin.bucur@nxp.com>
Subject: [PATCH 1/4] soc/fsl/qbman: Check if CPU is offline when initializing portals
Date: Thu, 20 Sep 2018 18:06:48 +0300 [thread overview]
Message-ID: <1537456011-10769-2-git-send-email-madalin.bucur@nxp.com> (raw)
In-Reply-To: <1537456011-10769-1-git-send-email-madalin.bucur@nxp.com>
From: Roy Pledge <roy.pledge@nxp.com>
If the affine portal for a specific CPU is offline at boot time
affine its interrupt to CPU 0. If the CPU is later brought online
the hotplug handler will correctly adjust the affinity.
Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
---
drivers/soc/fsl/qbman/bman.c | 17 +++++++++++++----
drivers/soc/fsl/qbman/qman.c | 18 +++++++++++++-----
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/drivers/soc/fsl/qbman/bman.c b/drivers/soc/fsl/qbman/bman.c
index f9485cedc648..2e6e682bf16b 100644
--- a/drivers/soc/fsl/qbman/bman.c
+++ b/drivers/soc/fsl/qbman/bman.c
@@ -562,10 +562,19 @@ static int bman_create_portal(struct bman_portal *portal,
dev_err(c->dev, "request_irq() failed\n");
goto fail_irq;
}
- if (c->cpu != -1 && irq_can_set_affinity(c->irq) &&
- irq_set_affinity(c->irq, cpumask_of(c->cpu))) {
- dev_err(c->dev, "irq_set_affinity() failed\n");
- goto fail_affinity;
+ if (cpu_online(c->cpu) && c->cpu != -1 &&
+ irq_can_set_affinity(c->irq)) {
+ if (irq_set_affinity(c->irq, cpumask_of(c->cpu))) {
+ dev_err(c->dev, "irq_set_affinity() failed %d\n",
+ c->cpu);
+ goto fail_affinity;
+ }
+ } else {
+ /* CPU is offline, direct IRQ to CPU 0 */
+ if (irq_set_affinity(c->irq, cpumask_of(0))) {
+ dev_err(c->dev, "irq_set_affinity() cpu 0 failed\n");
+ goto fail_affinity;
+ }
}
/* Need RCR to be empty before continuing */
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index ecb22749df0b..7dbcb475a59c 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -935,7 +935,6 @@ static inline int qm_mc_result_timeout(struct qm_portal *portal,
break;
udelay(1);
} while (--timeout);
-
return timeout;
}
@@ -1210,10 +1209,19 @@ static int qman_create_portal(struct qman_portal *portal,
dev_err(c->dev, "request_irq() failed\n");
goto fail_irq;
}
- if (c->cpu != -1 && irq_can_set_affinity(c->irq) &&
- irq_set_affinity(c->irq, cpumask_of(c->cpu))) {
- dev_err(c->dev, "irq_set_affinity() failed\n");
- goto fail_affinity;
+ if (cpu_online(c->cpu) && c->cpu != -1 &&
+ irq_can_set_affinity(c->irq)) {
+ if (irq_set_affinity(c->irq, cpumask_of(c->cpu))) {
+ dev_err(c->dev, "irq_set_affinity() failed %d\n",
+ c->cpu);
+ goto fail_affinity;
+ }
+ } else {
+ /* CPU is offline, direct IRQ to CPU 0 */
+ if (irq_set_affinity(c->irq, cpumask_of(0))) {
+ dev_err(c->dev, "irq_set_affinity() cpu 0 failed\n");
+ goto fail_affinity;
+ }
}
/* Need EQCR to be empty before continuing */
--
2.1.0
next prev parent reply other threads:[~2018-09-20 15:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-20 15:06 [PATCH 0/4] soc/fsl/qbman: DPAA QBMan fixes and additions Madalin Bucur
2018-09-20 15:06 ` Madalin Bucur [this message]
2018-09-21 22:15 ` [PATCH 1/4] soc/fsl/qbman: Check if CPU is offline when initializing portals Li Yang
2018-09-24 8:54 ` Madalin-cristian Bucur
2018-09-20 15:06 ` [PATCH 2/4] soc/fsl/qbman: Add 64 bit DMA addressing requirement to QBMan Madalin Bucur
2018-09-20 18:54 ` Li Yang
2018-09-20 15:06 ` [PATCH 3/4] soc/fsl/qbman: Use last response to determine valid bit Madalin Bucur
2018-09-20 15:06 ` [PATCH 4/4] soc/fsl_qbman: export coalesce change API Madalin Bucur
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=1537456011-10769-2-git-send-email-madalin.bucur@nxp.com \
--to=madalin.bucur@nxp.com \
--cc=catalin.marinas@arm.com \
--cc=claudiu.manoil@nxp.com \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=oss@buserror.net \
--cc=roy.pledge@nxp.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).