From: "Cédric Le Goater" <clg@kaod.org>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Greg Kurz <groug@kaod.org>
Subject: Re: [Qemu-devel] [PATCH 1/3] spapr: introduce a spapr_irq class 'nr_msis' attribute
Date: Tue, 11 Sep 2018 06:41:24 +0200 [thread overview]
Message-ID: <e8f02b91-6e8f-9215-18c8-401049be5416@kaod.org> (raw)
In-Reply-To: <20180911014821.GE7978@umbus.fritz.box>
On 09/11/2018 03:48 AM, David Gibson wrote:
> On Mon, Sep 10, 2018 at 01:02:20PM +0200, Cédric Le Goater wrote:
> 11;rgb:ffff/ffff/ffff> The number of MSI interrupts a sPAPR machine can allocate is in direct
>> relation with the number of interrupts of the sPAPRIrq backend. Define
>> statically this value at the sPAPRIrq class level.
>>
>> Signed-off-by: Cédric Le Goater <clg@kaod.org>
>> ---
>> include/hw/ppc/spapr_irq.h | 1 +
>> hw/ppc/spapr_irq.c | 9 +++++++--
>> 2 files changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
>> index 0e98c4474bb2..650f810ad2aa 100644
>> --- a/include/hw/ppc/spapr_irq.h
>> +++ b/include/hw/ppc/spapr_irq.h
>> @@ -31,6 +31,7 @@ void spapr_irq_msi_reset(sPAPRMachineState *spapr);
>>
>> typedef struct sPAPRIrq {
>> uint32_t nr_irqs;
>> + uint32_t nr_msis;
>>
>> void (*init)(sPAPRMachineState *spapr, Error **errp);
>> int (*claim)(sPAPRMachineState *spapr, int irq, bool lsi, Error **errp);
>> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
>> index 0cbb5dd39368..d369ac96f5cd 100644
>> --- a/hw/ppc/spapr_irq.c
>> +++ b/hw/ppc/spapr_irq.c
>> @@ -99,7 +99,7 @@ static void spapr_irq_init_xics(sPAPRMachineState *spapr, Error **errp)
>>
>> /* Initialize the MSI IRQ allocator. */
>> if (!SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) {
>> - spapr_irq_msi_init(spapr, XICS_IRQ_BASE + nr_irqs - SPAPR_IRQ_MSI);
>> + spapr_irq_msi_init(spapr, smc->irq->nr_msis);
>> }
>>
>> if (kvm_enabled()) {
>> @@ -195,8 +195,13 @@ static void spapr_irq_print_info_xics(sPAPRMachineState *spapr, Monitor *mon)
>> ics_pic_print_info(spapr->ics, mon);
>> }
>>
>> +#define SPAPR_IRQ_XICS_NR_IRQS XICS_IRQS_SPAPR
>> +#define SPAPR_IRQ_XICS_NR_MSIS \
>> + (XICS_IRQ_BASE + SPAPR_IRQ_XICS_NR_IRQS - SPAPR_IRQ_MSI)
>
> Uh.. I'm not quite understanding how XICS_IRQ_BASE gets into this.
because the IRQ ranges of the new static IRQ number space start at
the sPAPR IRQ number offset.
XICS_IRQ_BASE 0x1000
SPAPR_IRQ_XICS_NR_IRQS 0x400
SPAPR_IRQ_MSI 0x1300
0x1000 + 0x400 - 0x1300 = 0x100
we could use SPAPR_IRQ_EPOW instead or some other value defining
the IRQ0 number.
>
>> sPAPRIrq spapr_irq_xics = {
>> - .nr_irqs = XICS_IRQS_SPAPR,
>> + .nr_irqs = SPAPR_IRQ_XICS_NR_IRQS,
>> + .nr_msis = SPAPR_IRQ_XICS_NR_MSIS,
>>
>> .init = spapr_irq_init_xics,
>> .claim = spapr_irq_claim_xics,
>
next prev parent reply other threads:[~2018-09-11 4:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-10 11:02 [Qemu-devel] [PATCH 0/3] spapr: introduce a new sPAPRIrq backend Cédric Le Goater
2018-09-10 11:02 ` [Qemu-devel] [PATCH 1/3] spapr: introduce a spapr_irq class 'nr_msis' attribute Cédric Le Goater
2018-09-11 1:48 ` David Gibson
2018-09-11 4:41 ` Cédric Le Goater [this message]
2018-09-13 6:11 ` David Gibson
2018-09-10 11:02 ` [Qemu-devel] [PATCH 2/3] spapr: increase the size of the IRQ number space Cédric Le Goater
2018-09-11 1:49 ` David Gibson
2018-09-10 11:02 ` [Qemu-devel] [PATCH 3/3] spapr_pci: fix "ibm,pe-total-#msi" value Cédric Le Goater
2018-09-11 1:50 ` [Qemu-devel] [PATCH 3/3] spapr_pci: fix "ibm, pe-total-#msi" value David Gibson
2018-09-11 4:42 ` Cédric Le Goater
2018-09-10 15:02 ` [Qemu-devel] [PATCH 0/3] spapr: introduce a new sPAPRIrq backend Greg Kurz
2018-09-10 17:24 ` Cédric Le Goater
2018-09-11 1:52 ` David Gibson
2018-09-11 7:22 ` Greg Kurz
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=e8f02b91-6e8f-9215-18c8-401049be5416@kaod.org \
--to=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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.