From: Arun Chandran <achandran@mvista.com>
To: Feng Kan <fkan@apm.com>
Cc: "tglx@linutronix.de" <tglx@linutronix.de>,
patches <patches@apm.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Marc Zyngier <marc.zyngier@arm.com>, Vinayak Kale <vkale@apm.com>
Subject: Re: [PATCH V3] irqchip:gic: change access of gicc_ctrl register to read modify write.
Date: Tue, 9 Sep 2014 11:31:49 +0530 [thread overview]
Message-ID: <CAFdej03AmUn92sSH=7Hfk0+yWEFWaywJt63DjeTc+nHSZeb61A@mail.gmail.com> (raw)
In-Reply-To: <CAL85gmBRUuc3mtOGSkNuspEgkRQe42LV0e=fQfNmwcCicjT=vA@mail.gmail.com>
On Mon, Sep 8, 2014 at 10:27 PM, Feng Kan <fkan@apm.com> wrote:
> On Mon, Sep 8, 2014 at 1:52 AM, Arun Chandran <achandran@mvista.com> wrote:
>> Hi Feng,
>>
>> Is this patch still needed to fix perf calltrace?
> Yes, if the someone decide to run the secure mode of the GIC, which is
> what is present in
> the kernel tree now.
>
>> http://lists.infradead.org/pipermail/linux-arm-kernel/2014-June/265814.html
>>
>> On Fri, Feb 28, 2014 at 3:06 AM, Feng Kan <fkan@apm.com> wrote:
>>> This change is made to preserve the GIC v2 releated bits in the
>>> GIC_CPU_CTRL register (also known as the GICC_CTLR register in spec).
>>> The original code only set the enable/disable group bit in this register.
>>> This code will preserve the bypass bits configured by the bootload except
>>> the enable/disable bit. The main reason for this change is to allow the
>>> bypass bits specified in the v2 spec to remain untouched by the current
>>> GIC code. In the X-Gene platform, the bypass functionality is not used
>>> and bypass must be disabled at all time.
>>>
>>> Signed-off-by: Vinayak Kale <vkale@apm.com>
>>> Acked-by: Anup Patel <apatel@apm.com>
>>> Signed-off-by: Feng Kan <fkan@apm.com>
>>> ---
>>> V3 Changes:
>>> - Sorry, forgot to change the mask for cpu_init path
>>> assumed bootloader setup bits correctly.
>>> V2 Changes:
>>> - only mask off v2 bypass bits
>>> drivers/irqchip/irq-gic.c | 32 +++++++++++++++++++++++++++++---
>>> 1 files changed, 29 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
>>> index 341c601..3ca7995 100644
>>> --- a/drivers/irqchip/irq-gic.c
>>> +++ b/drivers/irqchip/irq-gic.c
>>> @@ -418,6 +418,7 @@ static void gic_cpu_init(struct gic_chip_data *gic)
>>> void __iomem *dist_base = gic_data_dist_base(gic);
>>> void __iomem *base = gic_data_cpu_base(gic);
>>> unsigned int cpu_mask, cpu = smp_processor_id();
>>> + unsigned int ctrl_mask;
>>> int i;
>>>
>>> /*
>>> @@ -449,13 +450,29 @@ static void gic_cpu_init(struct gic_chip_data *gic)
>>> writel_relaxed(0xa0a0a0a0, dist_base + GIC_DIST_PRI + i * 4 / 4);
>>>
>>> writel_relaxed(0xf0, base + GIC_CPU_PRIMASK);
>>> - writel_relaxed(1, base + GIC_CPU_CTRL);
>>> +
>>> + ctrl_mask = readl(base + GIC_CPU_CTRL);
>>
>> readl_relaxed() here?
>>
>>> +
>>> + /* Mask out the gic v2 bypass bits */
>>> + ctrl_mask &= 0x1e0;
>>> +
>>> + /* Enable group 0 */
>>> + ctrl_mask |= 0x1;
>>> + writel_relaxed(ctrl_mask, base + GIC_CPU_CTRL);
>>> }
>>>
>>> void gic_cpu_if_down(void)
>>> {
>>> + unsigned int ctrl_mask;
>>> void __iomem *cpu_base = gic_data_cpu_base(&gic_data[0]);
>>> - writel_relaxed(0, cpu_base + GIC_CPU_CTRL);
>>> +
>>> + ctrl_mask = readl(cpu_base + GIC_CPU_CTRL);
>> readl_relaxed() here?
>>
>>> + /*
>>> + * Disable grp enable bit, leave the bypass bits alone as changing
>>> + * them could leave the system unstable
>>> + */
>>> + ctrl_mask &= 0x1e0;
>>> + writel_relaxed(ctrl_mask, cpu_base + GIC_CPU_CTRL);
>>> }
>>>
>>> #ifdef CONFIG_CPU_PM
>>> @@ -566,6 +583,7 @@ static void gic_cpu_restore(unsigned int gic_nr)
>>> {
>>> int i;
>>> u32 *ptr;
>>> + unsigned int ctrl_mask;
>>> void __iomem *dist_base;
>>> void __iomem *cpu_base;
>>>
>>> @@ -590,7 +608,15 @@ static void gic_cpu_restore(unsigned int gic_nr)
>>> writel_relaxed(0xa0a0a0a0, dist_base + GIC_DIST_PRI + i * 4);
>>>
>>> writel_relaxed(0xf0, cpu_base + GIC_CPU_PRIMASK);
>>> - writel_relaxed(1, cpu_base + GIC_CPU_CTRL);
>>> +
>>> + ctrl_mask = readl(cpu_base + GIC_CPU_CTRL);
>>
>> readl_relaxed() here?
> Trying to make sure read is completed before write back out to gic.
>>
Will the cpu reorder readl_relaxed() and a writel_relaxed() calls?
val = readl_relaxed(reg1);
val += 1;
wrietl_relaxed(val, reg1);
In the above code reg1 getting 'val+1' is not guaranteed?
--Arun
next prev parent reply other threads:[~2014-09-09 6:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-27 21:36 [PATCH V3] irqchip:gic: change access of gicc_ctrl register to read modify write Feng Kan
2014-09-08 8:52 ` Arun Chandran
2014-09-08 16:57 ` Feng Kan
2014-09-09 6:01 ` Arun Chandran [this message]
2014-09-09 10:57 ` Arun KS
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='CAFdej03AmUn92sSH=7Hfk0+yWEFWaywJt63DjeTc+nHSZeb61A@mail.gmail.com' \
--to=achandran@mvista.com \
--cc=fkan@apm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=patches@apm.com \
--cc=tglx@linutronix.de \
--cc=vkale@apm.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).