From: David Gibson <david@gibson.dropbear.id.au>
To: qemu-ppc@nongnu.org, clg@kaod.org, qemu-devel@nongnu.org
Cc: "Jason Wang" <jasowang@redhat.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
groug@kaod.org, "Laurent Vivier" <laurent@vivier.eu>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
philmd@redhat.com, "David Gibson" <david@gibson.dropbear.id.au>
Subject: [PATCH 03/20] xics: Rename misleading ics_simple_*() functions
Date: Wed, 25 Sep 2019 16:45:17 +1000 [thread overview]
Message-ID: <20190925064534.19155-4-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20190925064534.19155-1-david@gibson.dropbear.id.au>
There are a number of ics_simple_*() functions that aren't actually
specific to TYPE_XICS_SIMPLE at all, and are equally valid on
TYPE_XICS_BASE. Rename them to ics_*() accordingly.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
---
hw/intc/trace-events | 6 +++---
hw/intc/xics.c | 29 ++++++++++++++---------------
hw/intc/xics_spapr.c | 12 ++++++------
hw/ppc/pnv_psi.c | 4 ++--
hw/ppc/spapr_irq.c | 2 +-
include/hw/ppc/xics.h | 6 +++---
6 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/hw/intc/trace-events b/hw/intc/trace-events
index fdc716c2cc..527c3f76ca 100644
--- a/hw/intc/trace-events
+++ b/hw/intc/trace-events
@@ -66,10 +66,10 @@ xics_icp_accept(uint32_t old_xirr, uint32_t new_xirr) "icp_accept: XIRR 0x%"PRIx
xics_icp_eoi(int server, uint32_t xirr, uint32_t new_xirr) "icp_eoi: server %d given XIRR 0x%"PRIx32" new XIRR 0x%"PRIx32
xics_icp_irq(int server, int nr, uint8_t priority) "cpu %d trying to deliver irq 0x%"PRIx32" priority 0x%x"
xics_icp_raise(uint32_t xirr, uint8_t pending_priority) "raising IRQ new XIRR=0x%x new pending priority=0x%x"
-xics_ics_simple_set_irq_msi(int srcno, int nr) "set_irq_msi: srcno %d [irq 0x%x]"
+xics_ics_set_irq_msi(int srcno, int nr) "set_irq_msi: srcno %d [irq 0x%x]"
xics_masked_pending(void) "set_irq_msi: masked pending"
-xics_ics_simple_set_irq_lsi(int srcno, int nr) "set_irq_lsi: srcno %d [irq 0x%x]"
-xics_ics_simple_write_xive(int nr, int srcno, int server, uint8_t priority) "ics_write_xive: irq 0x%x [src %d] server 0x%x prio 0x%x"
+xics_ics_set_irq_lsi(int srcno, int nr) "set_irq_lsi: srcno %d [irq 0x%x]"
+xics_ics_write_xive(int nr, int srcno, int server, uint8_t priority) "ics_write_xive: irq 0x%x [src %d] server 0x%x prio 0x%x"
xics_ics_reject(int nr, int srcno) "reject irq 0x%x [src %d]"
xics_ics_eoi(int nr) "ics_eoi: irq 0x%x"
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 93139b0189..310dc72b46 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -428,11 +428,11 @@ static void ics_resend_lsi(ICSState *ics, int srcno)
}
}
-static void ics_simple_set_irq_msi(ICSState *ics, int srcno, int val)
+static void ics_set_irq_msi(ICSState *ics, int srcno, int val)
{
ICSIRQState *irq = ics->irqs + srcno;
- trace_xics_ics_simple_set_irq_msi(srcno, srcno + ics->offset);
+ trace_xics_ics_set_irq_msi(srcno, srcno + ics->offset);
if (val) {
if (irq->priority == 0xff) {
@@ -444,11 +444,11 @@ static void ics_simple_set_irq_msi(ICSState *ics, int srcno, int val)
}
}
-static void ics_simple_set_irq_lsi(ICSState *ics, int srcno, int val)
+static void ics_set_irq_lsi(ICSState *ics, int srcno, int val)
{
ICSIRQState *irq = ics->irqs + srcno;
- trace_xics_ics_simple_set_irq_lsi(srcno, srcno + ics->offset);
+ trace_xics_ics_set_irq_lsi(srcno, srcno + ics->offset);
if (val) {
irq->status |= XICS_STATUS_ASSERTED;
} else {
@@ -457,7 +457,7 @@ static void ics_simple_set_irq_lsi(ICSState *ics, int srcno, int val)
ics_resend_lsi(ics, srcno);
}
-void ics_simple_set_irq(void *opaque, int srcno, int val)
+void ics_set_irq(void *opaque, int srcno, int val)
{
ICSState *ics = (ICSState *)opaque;
@@ -467,13 +467,13 @@ void ics_simple_set_irq(void *opaque, int srcno, int val)
}
if (ics->irqs[srcno].flags & XICS_FLAGS_IRQ_LSI) {
- ics_simple_set_irq_lsi(ics, srcno, val);
+ ics_set_irq_lsi(ics, srcno, val);
} else {
- ics_simple_set_irq_msi(ics, srcno, val);
+ ics_set_irq_msi(ics, srcno, val);
}
}
-static void ics_simple_write_xive_msi(ICSState *ics, int srcno)
+static void ics_write_xive_msi(ICSState *ics, int srcno)
{
ICSIRQState *irq = ics->irqs + srcno;
@@ -486,13 +486,13 @@ static void ics_simple_write_xive_msi(ICSState *ics, int srcno)
icp_irq(ics, irq->server, srcno + ics->offset, irq->priority);
}
-static void ics_simple_write_xive_lsi(ICSState *ics, int srcno)
+static void ics_write_xive_lsi(ICSState *ics, int srcno)
{
ics_resend_lsi(ics, srcno);
}
-void ics_simple_write_xive(ICSState *ics, int srcno, int server,
- uint8_t priority, uint8_t saved_priority)
+void ics_write_xive(ICSState *ics, int srcno, int server,
+ uint8_t priority, uint8_t saved_priority)
{
ICSIRQState *irq = ics->irqs + srcno;
@@ -500,13 +500,12 @@ void ics_simple_write_xive(ICSState *ics, int srcno, int server,
irq->priority = priority;
irq->saved_priority = saved_priority;
- trace_xics_ics_simple_write_xive(ics->offset + srcno, srcno, server,
- priority);
+ trace_xics_ics_write_xive(ics->offset + srcno, srcno, server, priority);
if (ics->irqs[srcno].flags & XICS_FLAGS_IRQ_LSI) {
- ics_simple_write_xive_lsi(ics, srcno);
+ ics_write_xive_lsi(ics, srcno);
} else {
- ics_simple_write_xive_msi(ics, srcno);
+ ics_write_xive_msi(ics, srcno);
}
}
diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
index 6577be0d92..3e9444813a 100644
--- a/hw/intc/xics_spapr.c
+++ b/hw/intc/xics_spapr.c
@@ -179,7 +179,7 @@ static void rtas_set_xive(PowerPCCPU *cpu, SpaprMachineState *spapr,
}
srcno = nr - ics->offset;
- ics_simple_write_xive(ics, srcno, server, priority, priority);
+ ics_write_xive(ics, srcno, server, priority, priority);
rtas_st(rets, 0, RTAS_OUT_SUCCESS);
}
@@ -243,8 +243,8 @@ static void rtas_int_off(PowerPCCPU *cpu, SpaprMachineState *spapr,
}
srcno = nr - ics->offset;
- ics_simple_write_xive(ics, srcno, ics->irqs[srcno].server, 0xff,
- ics->irqs[srcno].priority);
+ ics_write_xive(ics, srcno, ics->irqs[srcno].server, 0xff,
+ ics->irqs[srcno].priority);
rtas_st(rets, 0, RTAS_OUT_SUCCESS);
}
@@ -276,9 +276,9 @@ static void rtas_int_on(PowerPCCPU *cpu, SpaprMachineState *spapr,
}
srcno = nr - ics->offset;
- ics_simple_write_xive(ics, srcno, ics->irqs[srcno].server,
- ics->irqs[srcno].saved_priority,
- ics->irqs[srcno].saved_priority);
+ ics_write_xive(ics, srcno, ics->irqs[srcno].server,
+ ics->irqs[srcno].saved_priority,
+ ics->irqs[srcno].saved_priority);
rtas_st(rets, 0, RTAS_OUT_SUCCESS);
}
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index 88ba8e7b9b..8ea81e9d8e 100644
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -311,7 +311,7 @@ static void pnv_psi_set_xivr(PnvPsi *psi, uint32_t reg, uint64_t val)
* do for now but a more accurate implementation would instead
* use a fixed server/prio and a remapper of the generated irq.
*/
- ics_simple_write_xive(ics, src, server, prio, prio);
+ ics_write_xive(ics, src, server, prio, prio);
}
static uint64_t pnv_psi_reg_read(PnvPsi *psi, uint32_t offset, bool mmio)
@@ -514,7 +514,7 @@ static void pnv_psi_power8_realize(DeviceState *dev, Error **errp)
ics_set_irq_type(ics, i, true);
}
- psi->qirqs = qemu_allocate_irqs(ics_simple_set_irq, ics, ics->nr_irqs);
+ psi->qirqs = qemu_allocate_irqs(ics_set_irq, ics, ics->nr_irqs);
/* XSCOM region for PSI registers */
pnv_xscom_region_init(&psi->xscom_regs, OBJECT(dev), &pnv_psi_xscom_ops,
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index d8f46b6797..ac189c5796 100644
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -210,7 +210,7 @@ static void spapr_irq_set_irq_xics(void *opaque, int srcno, int val)
{
SpaprMachineState *spapr = opaque;
- ics_simple_set_irq(spapr->ics, srcno, val);
+ ics_set_irq(spapr->ics, srcno, val);
}
static void spapr_irq_reset_xics(SpaprMachineState *spapr, Error **errp)
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index d7d8e846b4..e72fb67968 100644
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -169,9 +169,9 @@ uint32_t icp_accept(ICPState *ss);
uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr);
void icp_eoi(ICPState *icp, uint32_t xirr);
-void ics_simple_write_xive(ICSState *ics, int nr, int server,
- uint8_t priority, uint8_t saved_priority);
-void ics_simple_set_irq(void *opaque, int srcno, int val);
+void ics_write_xive(ICSState *ics, int nr, int server,
+ uint8_t priority, uint8_t saved_priority);
+void ics_set_irq(void *opaque, int srcno, int val);
static inline bool ics_irq_free(ICSState *ics, uint32_t srcno)
{
--
2.21.0
next prev parent reply other threads:[~2019-09-25 6:57 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 6:45 [PATCH 00/20] spapr: IRQ subsystem cleanups David Gibson
2019-09-25 6:45 ` [PATCH 01/20] xics: Use incomplete type for XICSFabric David Gibson
2019-09-25 6:55 ` Cédric Le Goater
2019-09-25 7:48 ` Greg Kurz
2019-09-25 7:45 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 02/20] xics: Eliminate 'reject', 'resend' and 'eoi' class hooks David Gibson
2019-09-25 6:45 ` David Gibson [this message]
2019-09-25 6:45 ` [PATCH 04/20] xics: Eliminate reset hook David Gibson
2019-09-25 7:33 ` Cédric Le Goater
2019-09-25 7:59 ` Greg Kurz
2019-09-26 2:54 ` David Gibson
2019-09-25 6:45 ` [PATCH 05/20] xics: Merge TYPE_ICS_BASE and TYPE_ICS_SIMPLE classes David Gibson
2019-09-25 8:16 ` Greg Kurz
2019-09-25 8:31 ` Greg Kurz
2019-09-26 0:55 ` David Gibson
2019-09-26 0:52 ` David Gibson
2019-09-25 12:47 ` Cédric Le Goater
2019-09-25 6:45 ` [PATCH 06/20] xics: Create sPAPR specific ICS subtype David Gibson
2019-09-25 7:34 ` Cédric Le Goater
2019-09-25 8:40 ` Greg Kurz
2019-09-25 8:55 ` Cédric Le Goater
2019-09-25 9:07 ` Greg Kurz
2019-09-26 0:56 ` David Gibson
2019-09-26 7:09 ` Cédric Le Goater
2019-09-27 16:05 ` Greg Kurz
2019-09-30 8:45 ` David Gibson
2019-09-30 17:00 ` Greg Kurz
2019-10-01 1:45 ` David Gibson
2019-09-25 6:45 ` [PATCH 07/20] spapr: Fold spapr_phb_lsi_qirq() into its single caller David Gibson
2019-09-25 6:58 ` Cédric Le Goater
2019-09-25 8:56 ` Greg Kurz
2019-09-26 7:08 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 08/20] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper David Gibson
2019-09-25 6:58 ` Cédric Le Goater
2019-09-25 8:57 ` Greg Kurz
2019-09-26 7:08 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 09/20] spapr: Clarify and fix handling of nr_irqs David Gibson
2019-09-25 7:05 ` Cédric Le Goater
2019-09-26 1:03 ` David Gibson
2019-09-26 7:02 ` Cédric Le Goater
2019-09-25 17:13 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 10/20] spapr: Eliminate nr_irqs parameter to SpaprIrq::init David Gibson
2019-09-25 7:06 ` Cédric Le Goater
2019-09-25 17:16 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 11/20] spapr: Fix indexing of XICS irqs David Gibson
2019-09-25 7:11 ` Cédric Le Goater
2019-09-25 20:17 ` Greg Kurz
2019-09-26 1:31 ` David Gibson
2019-09-26 7:21 ` Greg Kurz
2019-09-26 11:32 ` David Gibson
2019-09-26 14:44 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 12/20] spapr: Simplify spapr_qirq() handling David Gibson
2019-09-25 7:16 ` Cédric Le Goater
2019-09-25 20:30 ` Greg Kurz
2019-09-26 7:10 ` Philippe Mathieu-Daudé
2019-09-25 6:45 ` [PATCH 13/20] spapr: Eliminate SpaprIrq:get_nodename method David Gibson
2019-09-25 7:19 ` Cédric Le Goater
2019-09-26 7:11 ` Philippe Mathieu-Daudé
2019-09-26 7:48 ` Greg Kurz
2019-09-26 11:36 ` David Gibson
2019-09-25 6:45 ` [PATCH 14/20] spapr: Remove unhelpful tracepoints from spapr_irq_free_xics() David Gibson
2019-09-25 7:20 ` Cédric Le Goater
2019-09-26 7:11 ` Philippe Mathieu-Daudé
2019-09-26 7:50 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 15/20] spapr: Handle freeing of multiple irqs in frontend only David Gibson
2019-09-25 7:21 ` Cédric Le Goater
2019-09-26 7:52 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 16/20] spapr, xics, xive: Better use of assert()s on irq claim/free paths David Gibson
2019-09-25 7:22 ` Cédric Le Goater
2019-09-26 8:08 ` Greg Kurz
2019-09-26 11:39 ` David Gibson
2019-09-25 6:45 ` [PATCH 17/20] spapr: Remove unused return value in claim path David Gibson
2019-09-25 7:23 ` Cédric Le Goater
2019-09-26 7:13 ` Philippe Mathieu-Daudé
2019-09-26 8:36 ` Greg Kurz
2019-09-27 1:47 ` David Gibson
2019-09-25 6:45 ` [PATCH 18/20] xive: Improve irq claim/free path David Gibson
2019-09-25 7:25 ` Cédric Le Goater
2019-09-26 1:05 ` David Gibson
2019-09-25 6:45 ` [PATCH 19/20] spapr: Use less cryptic representation of which irq backends are supported David Gibson
2019-09-25 7:28 ` Cédric Le Goater
2019-09-26 9:16 ` Greg Kurz
2019-09-25 6:45 ` [PATCH 20/20] spapr: Eliminate SpaprIrq::init hook David Gibson
2019-09-25 7:31 ` Cédric Le Goater
2019-09-26 1:13 ` David Gibson
2019-09-26 7:05 ` Cédric Le Goater
2019-09-26 11:29 ` David Gibson
2019-09-26 15:35 ` Greg Kurz
2019-09-27 5:51 ` David Gibson
2019-09-27 6:23 ` Greg Kurz
2019-09-26 15:39 ` Greg Kurz
2019-09-27 14:12 ` Greg Kurz
2019-09-29 9:34 ` David Gibson
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=20190925064534.19155-4-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=groug@kaod.org \
--cc=jasowang@redhat.com \
--cc=laurent@vivier.eu \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=riku.voipio@iki.fi \
/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).