From: Dave Olson <olson@cumulusnetworks•com>
To: Benjamin Herrenschmidt <benh@kernel•crashing.org>
Cc: Paul Mackerras <paulus@samba•org>, linuxppc-dev@lists•ozlabs.org
Subject: Re: [PATCH 1/1] powerpc: fix missing L2 cache size in /sys/devices/system/cpu
Date: Tue, 10 Feb 2015 00:00:02 -0800 [thread overview]
Message-ID: <20150210080002.GA23291@cumulusnetworks.com> (raw)
In-Reply-To: <1423527151.4924.64.camel@kernel.crashing.org>
Benjamin Herrenschmidt <benh@kernel•crashing.org> wrote:
> On Mon, 2015-02-09 at 15:43 -0800, Dave Olson wrote:
> > Michael Ellerman <mpe@ellerman•id.au> wrote:
> >
> > > On Mon, 2015-02-09 at 14:14 -0800, Dave Olson wrote:
> > > > From: Dave Olson <olson@cumulusnetworks•com>
> > > >
> > > > Fix missing L2 cache size in /sys/devices/system/cpu/cpu0/cache/index2/size
> > > > This bug appears to be introduced in 2.6.29 by 93197a36a9c16a85fb24cf5a8639f7bf9af838a3.
> > > > The missing entry caused lscpu to error out on e500v2 devices, and probably others
> > > > error: cannot open /sys/devices/system/cpu/cpu0/cache/index2/size: No such file or directory
> > > > The DTS files we see use cache-size for the unified L2 cache size, not d-cache-size
> > >
> > > Can you convince me that this is not going to break other machines that have
> > > "d-cache-size" but not "cache-size"?
> >
> > I'm unable to find any dts file that uses d-cache-size for the L2
> > unified cache. All in the powerpc tree in arch/powerpc/boot/dts/*
> > are using cache-size in the L2 description for the cache size.
> >
> > As best as I can tell from looking around, this is universal.
>
> It may be universal for embedded machines using DTS in the kernel tree
> but it's definitely not true of any Mac or server machine (from which
> there is no DTS in the kernel as we get the DT from the firmware).
OK, now that I understand that's the case, I'll have to go back and
re-do the patch to handle both cache-size and d-cache-size for the
L2 cache (using whichever is present).
I don't have any power Macs to use for testing, would one of you be
willing and able to verify the patch on a power Mac?
The patch below fixes my problem, and I don't think it will break
platforms like the PowerPC Mac that use d-cache-size
=====
diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c
index a3c684b..0d1f879 100644
--- a/arch/powerpc/kernel/cacheinfo.c
+++ b/arch/powerpc/kernel/cacheinfo.c
@@ -200,6 +200,10 @@ static int cache_size(const struct cache *cache, unsigned int *ret)
propname = cache_type_info[cache->type].size_prop;
cache_size = of_get_property(cache->ofnode, propname, NULL);
+ if (!cache_size && cache->type == CACHE_TYPE_UNIFIED) {
+ /* most embedded systems with L2 use "cache-size", allow that also */
+ cache_size = of_get_property(cache->ofnode, "cache-size", NULL);
+ }
if (!cache_size)
return -ENODEV;
=====
Thanks,
Dave Olson
olson@cumulusnetworks•com
next prev parent reply other threads:[~2015-02-10 8:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-09 22:14 [PATCH 1/1] powerpc: fix missing L2 cache size in /sys/devices/system/cpu Dave Olson
2015-02-09 23:33 ` Michael Ellerman
2015-02-09 23:43 ` Dave Olson
2015-02-10 0:12 ` Benjamin Herrenschmidt
2015-02-10 3:30 ` Michael Ellerman
2015-02-10 8:00 ` Dave Olson [this message]
2015-02-10 8:14 ` Benjamin Herrenschmidt
2015-02-10 16:55 ` Dave Olson
2015-02-10 19:45 ` Benjamin Herrenschmidt
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=20150210080002.GA23291@cumulusnetworks.com \
--to=olson@cumulusnetworks$(echo .)com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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