* Re: [PATCH] of: Fix export of of_find_matching_node_and_match()
From: Grant Likely @ 2012-12-19 15:04 UTC (permalink / raw)
To: Rob Herring
Cc: Stephen Warren, devicetree-discuss, linuxppc-dev@lists.ozlabs.org,
Linux Kernel Mailing List, Rob Herring
In-Reply-To: <50D1C608.9040001@gmail.com>
On Wed, 19 Dec 2012 07:50:00 -0600, Rob Herring <robherring2@gmail.com> wrote:
> On 12/19/2012 05:02 AM, Grant Likely wrote:
> > On Wed, Dec 19, 2012 at 10:58 AM, Grant Likely
> > <grant.likely@secretlab.ca> wrote:
> >> Commit 50c8af4cf9, "of: introduce for_each_matching_node_and_match()"
> >> renamed of_find_matching_node() to of_find_matching_node_and_match() and
> >> created a new static inline of_find_matching_node() wrapper around the
> >> new name. However, the change neglected to change the EXPORT_SYMBOL()
> >> reference causing build errors for modules.
> >>
> >> This patch fixes the EXPORT_SYMBOL() statement. Discovered on a PowerPC
> >> Efika build with the mpc52xx_uart driver being built as a module.
> >>
> >> Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> >> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> >> Cc: Stephen Warren <swarren@nvidia.com>
> >> Cc: Rob Herring <rob.herring@calxeda.com>
> >> Cc: Anatolij Gustschin <agust@denx.de>
> >
> > Rob, I've just pushed this out to my devicetree/merge branch. If
> > you've got any fixes queued up for Linus, then please pull this in
> > before sending them on to him. Otherwise I'll send Linus a pull req
> > for this fix this evening. Ether way, please reply to let me know what
> > you're going to do.
> >
>
> The only item on my todo is this one:
>
> "of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS"
>
> But I'm not going to get to it today if you want to pick it up.
I don't see that one anywhere. Where did it come from?
g.
^ permalink raw reply
* Re: [PATCH] of: Fix export of of_find_matching_node_and_match()
From: Rob Herring @ 2012-12-19 13:50 UTC (permalink / raw)
To: Grant Likely
Cc: Stephen Warren, devicetree-discuss, linuxppc-dev@lists.ozlabs.org,
Linux Kernel Mailing List, Rob Herring
In-Reply-To: <CACxGe6vTxQGr+t5O4q0J265K02-EEeEiGoOTvB1o-ee2bBrhZg@mail.gmail.com>
On 12/19/2012 05:02 AM, Grant Likely wrote:
> On Wed, Dec 19, 2012 at 10:58 AM, Grant Likely
> <grant.likely@secretlab.ca> wrote:
>> Commit 50c8af4cf9, "of: introduce for_each_matching_node_and_match()"
>> renamed of_find_matching_node() to of_find_matching_node_and_match() and
>> created a new static inline of_find_matching_node() wrapper around the
>> new name. However, the change neglected to change the EXPORT_SYMBOL()
>> reference causing build errors for modules.
>>
>> This patch fixes the EXPORT_SYMBOL() statement. Discovered on a PowerPC
>> Efika build with the mpc52xx_uart driver being built as a module.
>>
>> Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>> Cc: Stephen Warren <swarren@nvidia.com>
>> Cc: Rob Herring <rob.herring@calxeda.com>
>> Cc: Anatolij Gustschin <agust@denx.de>
>
> Rob, I've just pushed this out to my devicetree/merge branch. If
> you've got any fixes queued up for Linus, then please pull this in
> before sending them on to him. Otherwise I'll send Linus a pull req
> for this fix this evening. Ether way, please reply to let me know what
> you're going to do.
>
The only item on my todo is this one:
"of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS"
But I'm not going to get to it today if you want to pick it up.
Rob
> g.
>
> The following changes since commit 752451f01c4567b506bf4343082682dbb8fb30dd:
>
> Merge branch 'i2c-embedded/for-next' of
> git://git.pengutronix.de/git/wsa/linux (2012-12-18 16:51:10 -0800)
>
> are available in the git repository at:
>
> git://git.secretlab.ca/git/linux-2.6 devicetree/merge
>
> for you to fetch changes up to 80c2022e5645a1a789531d13010292c5c18bf1db:
>
> of: Fix export of of_find_matching_node_and_match() (2012-12-19
> 10:58:53 +0000)
>
> ----------------------------------------------------------------
> Grant Likely (1):
> of: Fix export of of_find_matching_node_and_match()
>
> drivers/of/base.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>> ---
>>
>> I'll push this patch out to my tree ASAP.
>>
>> drivers/of/base.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/of/base.c b/drivers/of/base.c
>> index db8d211..2390ddb 100644
>> --- a/drivers/of/base.c
>> +++ b/drivers/of/base.c
>> @@ -629,7 +629,7 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from,
>> read_unlock(&devtree_lock);
>> return np;
>> }
>> -EXPORT_SYMBOL(of_find_matching_node);
>> +EXPORT_SYMBOL(of_find_matching_node_and_match);
>>
>> /**
>> * of_modalias_node - Lookup appropriate modalias for a device node
>> --
>> 1.7.10.4
>>
>
>
>
> --
> Grant Likely, B.Sc., P.Eng.
> Secret Lab Technologies Ltd.
> _______________________________________________
> devicetree-discuss mailing list
> devicetree-discuss@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/devicetree-discuss
>
^ permalink raw reply
* Re: [PATCH] of: Fix export of of_find_matching_node_and_match()
From: Grant Likely @ 2012-12-19 11:02 UTC (permalink / raw)
To: Linux Kernel Mailing List, devicetree-discuss,
linuxppc-dev@lists.ozlabs.org
Cc: Anatolij Gustschin, Stephen Warren, Rob Herring
In-Reply-To: <1355914716-19469-1-git-send-email-grant.likely@secretlab.ca>
On Wed, Dec 19, 2012 at 10:58 AM, Grant Likely
<grant.likely@secretlab.ca> wrote:
> Commit 50c8af4cf9, "of: introduce for_each_matching_node_and_match()"
> renamed of_find_matching_node() to of_find_matching_node_and_match() and
> created a new static inline of_find_matching_node() wrapper around the
> new name. However, the change neglected to change the EXPORT_SYMBOL()
> reference causing build errors for modules.
>
> This patch fixes the EXPORT_SYMBOL() statement. Discovered on a PowerPC
> Efika build with the mpc52xx_uart driver being built as a module.
>
> Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: Rob Herring <rob.herring@calxeda.com>
> Cc: Anatolij Gustschin <agust@denx.de>
Rob, I've just pushed this out to my devicetree/merge branch. If
you've got any fixes queued up for Linus, then please pull this in
before sending them on to him. Otherwise I'll send Linus a pull req
for this fix this evening. Ether way, please reply to let me know what
you're going to do.
g.
The following changes since commit 752451f01c4567b506bf4343082682dbb8fb30dd:
Merge branch 'i2c-embedded/for-next' of
git://git.pengutronix.de/git/wsa/linux (2012-12-18 16:51:10 -0800)
are available in the git repository at:
git://git.secretlab.ca/git/linux-2.6 devicetree/merge
for you to fetch changes up to 80c2022e5645a1a789531d13010292c5c18bf1db:
of: Fix export of of_find_matching_node_and_match() (2012-12-19
10:58:53 +0000)
----------------------------------------------------------------
Grant Likely (1):
of: Fix export of of_find_matching_node_and_match()
drivers/of/base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
> ---
>
> I'll push this patch out to my tree ASAP.
>
> drivers/of/base.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index db8d211..2390ddb 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -629,7 +629,7 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from,
> read_unlock(&devtree_lock);
> return np;
> }
> -EXPORT_SYMBOL(of_find_matching_node);
> +EXPORT_SYMBOL(of_find_matching_node_and_match);
>
> /**
> * of_modalias_node - Lookup appropriate modalias for a device node
> --
> 1.7.10.4
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* [PATCH] of: Fix export of of_find_matching_node_and_match()
From: Grant Likely @ 2012-12-19 10:58 UTC (permalink / raw)
To: linux-kernel, devicetree-discuss, linuxppc-dev
Cc: Anatolij Gustschin, Stephen Warren, Rob Herring
Commit 50c8af4cf9, "of: introduce for_each_matching_node_and_match()"
renamed of_find_matching_node() to of_find_matching_node_and_match() and
created a new static inline of_find_matching_node() wrapper around the
new name. However, the change neglected to change the EXPORT_SYMBOL()
reference causing build errors for modules.
This patch fixes the EXPORT_SYMBOL() statement. Discovered on a PowerPC
Efika build with the mpc52xx_uart driver being built as a module.
Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Anatolij Gustschin <agust@denx.de>
---
I'll push this patch out to my tree ASAP.
drivers/of/base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index db8d211..2390ddb 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -629,7 +629,7 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from,
read_unlock(&devtree_lock);
return np;
}
-EXPORT_SYMBOL(of_find_matching_node);
+EXPORT_SYMBOL(of_find_matching_node_and_match);
/**
* of_modalias_node - Lookup appropriate modalias for a device node
--
1.7.10.4
^ permalink raw reply related
* [PATCH 5/5] perf: Create a sysfs entry for Power event format
From: Sukadev Bhattiprolu @ 2012-12-19 7:30 UTC (permalink / raw)
To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, Anton Blanchard, Jiri Olsa,
robert.richter, linuxppc-dev, linux-kernel
In-Reply-To: <20121219072646.GA30580@us.ibm.com>
Create a sysfs entry, '/sys/bus/event_source/devices/cpu/format/event'
which describes the format of a POWER cpu.
The format of the event is the same for all POWER cpus at least in
(Power6, Power7), so bulk of this change is common in the code common
to POWER cpus.
This code is based on corresponding code in x86.
Changelog[v2]: [Jiri Osla] Use PMU_FORMAT_ATTR() rather than duplicating it.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/perf_event_server.h | 6 ++++++
arch/powerpc/perf/core-book3s.c | 12 ++++++++++++
arch/powerpc/perf/power7-pmu.c | 1 +
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/include/asm/perf_event_server.h b/arch/powerpc/include/asm/perf_event_server.h
index 4315bc9..f8f7240 100644
--- a/arch/powerpc/include/asm/perf_event_server.h
+++ b/arch/powerpc/include/asm/perf_event_server.h
@@ -136,3 +136,9 @@ extern ssize_t power_events_sysfs_show(struct device *dev,
#define POWER_EVENT_ATTR(_name, _id) EVENT_ATTR(PM_##_name, _id, _p)
#define POWER_EVENT_PTR(_id) EVENT_PTR(_id, _p)
+
+/*
+ * Format of a perf event is the same on all POWER cpus. Declare a
+ * common sysfs attribute group that individual POWER cpus can share.
+ */
+extern struct attribute_group power_pmu_format_group;
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index fa476d5..4ae044b 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -1315,6 +1315,18 @@ ssize_t power_events_sysfs_show(struct device *dev,
return sprintf(page, "event=0x%02llx\n", pmu_attr->id);
}
+PMU_FORMAT_ATTR(event, "config:0-20");
+
+static struct attribute *power_pmu_format_attr[] = {
+ &format_attr_event.attr,
+ NULL,
+};
+
+struct attribute_group power_pmu_format_group = {
+ .name = "format",
+ .attrs = power_pmu_format_attr,
+};
+
struct pmu power_pmu = {
.pmu_enable = power_pmu_enable,
.pmu_disable = power_pmu_disable,
diff --git a/arch/powerpc/perf/power7-pmu.c b/arch/powerpc/perf/power7-pmu.c
index 5627940..5fb3c9b 100644
--- a/arch/powerpc/perf/power7-pmu.c
+++ b/arch/powerpc/perf/power7-pmu.c
@@ -410,6 +410,7 @@ static struct attribute_group power7_pmu_events_group = {
};
static const struct attribute_group *power7_pmu_attr_groups[] = {
+ &power_pmu_format_group,
&power7_pmu_events_group,
NULL,
};
--
1.7.1
^ permalink raw reply related
* [PATCH 4/5] perf/POWER7: Make some POWER7 events available in sysfs
From: Sukadev Bhattiprolu @ 2012-12-19 7:29 UTC (permalink / raw)
To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, Anton Blanchard, Jiri Olsa,
robert.richter, linuxppc-dev, linux-kernel
In-Reply-To: <20121219072646.GA30580@us.ibm.com>
Make some POWER7-specific perf events available in sysfs.
$ /bin/ls -1 /sys/bus/event_source/devices/cpu/events/
branch-instructions
branch-misses
cache-misses
cache-references
cpu-cycles
instructions
PM_BRU_FIN
PM_BRU_MPRED
PM_CMPLU_STALL
PM_CYC
PM_GCT_NOSLOT_CYC
PM_INST_CMPL
PM_LD_MISS_L1
PM_LD_REF_L1
stalled-cycles-backend
stalled-cycles-frontend
where the 'PM_*' events are POWER specific and the others are the
generic events.
This will enable users to specify these events with their symbolic
names rather than with their raw code.
perf stat -e 'cpu/PM_CYC' ...
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/perf_event_server.h | 2 ++
arch/powerpc/perf/power7-pmu.c | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/include/asm/perf_event_server.h b/arch/powerpc/include/asm/perf_event_server.h
index 20ca90f..4315bc9 100644
--- a/arch/powerpc/include/asm/perf_event_server.h
+++ b/arch/powerpc/include/asm/perf_event_server.h
@@ -134,3 +134,5 @@ extern ssize_t power_events_sysfs_show(struct device *dev,
#define GENERIC_EVENT_ATTR(_name, _id) EVENT_ATTR(_name, _id, _g)
#define GENERIC_EVENT_PTR(_id) EVENT_PTR(_id, _g)
+#define POWER_EVENT_ATTR(_name, _id) EVENT_ATTR(PM_##_name, _id, _p)
+#define POWER_EVENT_PTR(_id) EVENT_PTR(_id, _p)
diff --git a/arch/powerpc/perf/power7-pmu.c b/arch/powerpc/perf/power7-pmu.c
index ae5d757..5627940 100644
--- a/arch/powerpc/perf/power7-pmu.c
+++ b/arch/powerpc/perf/power7-pmu.c
@@ -373,6 +373,15 @@ GENERIC_EVENT_ATTR(cache-misses, LD_MISS_L1);
GENERIC_EVENT_ATTR(branch-instructions, BRU_FIN);
GENERIC_EVENT_ATTR(branch-misses, BRU_MPRED);
+POWER_EVENT_ATTR(CYC, CYC);
+POWER_EVENT_ATTR(GCT_NOSLOT_CYC, GCT_NOSLOT_CYC);
+POWER_EVENT_ATTR(CMPLU_STALL, CMPLU_STALL);
+POWER_EVENT_ATTR(INST_CMPL, INST_CMPL);
+POWER_EVENT_ATTR(LD_REF_L1, LD_REF_L1);
+POWER_EVENT_ATTR(LD_MISS_L1, LD_MISS_L1);
+POWER_EVENT_ATTR(BRU_FIN, BRU_FIN)
+POWER_EVENT_ATTR(BRU_MPRED, BRU_MPRED);
+
static struct attribute *power7_events_attr[] = {
GENERIC_EVENT_PTR(CYC),
GENERIC_EVENT_PTR(GCT_NOSLOT_CYC),
@@ -382,6 +391,15 @@ static struct attribute *power7_events_attr[] = {
GENERIC_EVENT_PTR(LD_MISS_L1),
GENERIC_EVENT_PTR(BRU_FIN),
GENERIC_EVENT_PTR(BRU_MPRED),
+
+ POWER_EVENT_PTR(CYC),
+ POWER_EVENT_PTR(GCT_NOSLOT_CYC),
+ POWER_EVENT_PTR(CMPLU_STALL),
+ POWER_EVENT_PTR(INST_CMPL),
+ POWER_EVENT_PTR(LD_REF_L1),
+ POWER_EVENT_PTR(LD_MISS_L1),
+ POWER_EVENT_PTR(BRU_FIN),
+ POWER_EVENT_PTR(BRU_MPRED),
NULL
};
--
1.7.1
^ permalink raw reply related
* [PATCH 3/5] perf/POWER7: Make generic event translations available in sysfs
From: Sukadev Bhattiprolu @ 2012-12-19 7:28 UTC (permalink / raw)
To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, Anton Blanchard, Jiri Olsa,
robert.richter, linuxppc-dev, linux-kernel
In-Reply-To: <20121219072646.GA30580@us.ibm.com>
[PATCH 3/5] perf/POWER7: Make generic event translations available in sysfs
Make the generic perf events in POWER7 available via sysfs.
$ ls /sys/bus/event_source/devices/cpu/events
branch-instructions
branch-misses
cache-misses
cache-references
cpu-cycles
instructions
stalled-cycles-backend
stalled-cycles-frontend
$ cat /sys/bus/event_source/devices/cpu/events/cache-misses
event=0x400f0
This patch is based on commits that implement this functionality on x86.
Eg:
commit a47473939db20e3961b200eb00acf5fcf084d755
Author: Jiri Olsa <jolsa@redhat.com>
Date: Wed Oct 10 14:53:11 2012 +0200
perf/x86: Make hardware event translations available in sysfs
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/perf_event_server.h | 25 +++++++++++++++++++
arch/powerpc/perf/core-book3s.c | 12 +++++++++
arch/powerpc/perf/power7-pmu.c | 34 ++++++++++++++++++++++++++
3 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/include/asm/perf_event_server.h b/arch/powerpc/include/asm/perf_event_server.h
index 9710be3..20ca90f 100644
--- a/arch/powerpc/include/asm/perf_event_server.h
+++ b/arch/powerpc/include/asm/perf_event_server.h
@@ -11,6 +11,7 @@
#include <linux/types.h>
#include <asm/hw_irq.h>
+#include <linux/device.h>
#define MAX_HWEVENTS 8
#define MAX_EVENT_ALTERNATIVES 8
@@ -35,6 +36,7 @@ struct power_pmu {
void (*disable_pmc)(unsigned int pmc, unsigned long mmcr[]);
int (*limited_pmc_event)(u64 event_id);
u32 flags;
+ const struct attribute_group **attr_groups;
int n_generic;
int *generic_events;
int (*cache_events)[PERF_COUNT_HW_CACHE_MAX]
@@ -109,3 +111,26 @@ extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
* If an event_id is not subject to the constraint expressed by a particular
* field, then it will have 0 in both the mask and value for that field.
*/
+
+extern ssize_t power_events_sysfs_show(struct device *dev,
+ struct device_attribute *attr, char *page);
+
+/*
+ * EVENT_VAR() is same as PMU_EVENT_VAR with a suffix.
+ *
+ * Having a suffix allows us to have aliases in sysfs - eg: the generic
+ * event 'cpu-cycles' can have two entries in sysfs: 'cpu-cycles' and
+ * 'PM_CYC' where the latter is the name by which the event is known in
+ * POWER CPU specification.
+ */
+#define EVENT_VAR(_id, _suffix) event_attr_##_id##_suffix
+#define EVENT_PTR(_id, _suffix) PMU_EVENT_PTR(EVENT_VAR(_id, _suffix))
+#define EVENT_ID(_id) PME_PM_##_id
+
+#define EVENT_ATTR(_name, _id, _suffix) \
+ PMU_EVENT_ATTR(_name, EVENT_VAR(_id, _suffix), EVENT_ID(_id), \
+ power_events_sysfs_show)
+
+#define GENERIC_EVENT_ATTR(_name, _id) EVENT_ATTR(_name, _id, _g)
+#define GENERIC_EVENT_PTR(_id) EVENT_PTR(_id, _g)
+
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index aa2465e..fa476d5 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -1305,6 +1305,16 @@ static int power_pmu_event_idx(struct perf_event *event)
return event->hw.idx;
}
+ssize_t power_events_sysfs_show(struct device *dev,
+ struct device_attribute *attr, char *page)
+{
+ struct perf_pmu_events_attr *pmu_attr;
+
+ pmu_attr = container_of(attr, struct perf_pmu_events_attr, attr);
+
+ return sprintf(page, "event=0x%02llx\n", pmu_attr->id);
+}
+
struct pmu power_pmu = {
.pmu_enable = power_pmu_enable,
.pmu_disable = power_pmu_disable,
@@ -1537,6 +1547,8 @@ int __cpuinit register_power_pmu(struct power_pmu *pmu)
pr_info("%s performance monitor hardware support registered\n",
pmu->name);
+ power_pmu.attr_groups = ppmu->attr_groups;
+
#ifdef MSR_HV
/*
* Use FCHV to ignore kernel events if MSR.HV is set.
diff --git a/arch/powerpc/perf/power7-pmu.c b/arch/powerpc/perf/power7-pmu.c
index 44e70d2..ae5d757 100644
--- a/arch/powerpc/perf/power7-pmu.c
+++ b/arch/powerpc/perf/power7-pmu.c
@@ -363,6 +363,39 @@ static int power7_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
},
};
+
+GENERIC_EVENT_ATTR(cpu-cycles, CYC);
+GENERIC_EVENT_ATTR(stalled-cycles-frontend, GCT_NOSLOT_CYC);
+GENERIC_EVENT_ATTR(stalled-cycles-backend, CMPLU_STALL);
+GENERIC_EVENT_ATTR(instructions, INST_CMPL);
+GENERIC_EVENT_ATTR(cache-references, LD_REF_L1);
+GENERIC_EVENT_ATTR(cache-misses, LD_MISS_L1);
+GENERIC_EVENT_ATTR(branch-instructions, BRU_FIN);
+GENERIC_EVENT_ATTR(branch-misses, BRU_MPRED);
+
+static struct attribute *power7_events_attr[] = {
+ GENERIC_EVENT_PTR(CYC),
+ GENERIC_EVENT_PTR(GCT_NOSLOT_CYC),
+ GENERIC_EVENT_PTR(CMPLU_STALL),
+ GENERIC_EVENT_PTR(INST_CMPL),
+ GENERIC_EVENT_PTR(LD_REF_L1),
+ GENERIC_EVENT_PTR(LD_MISS_L1),
+ GENERIC_EVENT_PTR(BRU_FIN),
+ GENERIC_EVENT_PTR(BRU_MPRED),
+ NULL
+};
+
+
+static struct attribute_group power7_pmu_events_group = {
+ .name = "events",
+ .attrs = power7_events_attr,
+};
+
+static const struct attribute_group *power7_pmu_attr_groups[] = {
+ &power7_pmu_events_group,
+ NULL,
+};
+
static struct power_pmu power7_pmu = {
.name = "POWER7",
.n_counter = 6,
@@ -374,6 +407,7 @@ static struct power_pmu power7_pmu = {
.get_alternatives = power7_get_alternatives,
.disable_pmc = power7_disable_pmc,
.flags = PPMU_ALT_SIPR,
+ .attr_groups = power7_pmu_attr_groups,
.n_generic = ARRAY_SIZE(power7_generic_events),
.generic_events = power7_generic_events,
.cache_events = &power7_cache_events,
--
1.7.1
^ permalink raw reply related
* [PATCH 2/5] perf: Make EVENT_ATTR and EVENT_PTR global
From: Sukadev Bhattiprolu @ 2012-12-19 7:28 UTC (permalink / raw)
To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, Anton Blanchard, Jiri Olsa,
robert.richter, linuxppc-dev, linux-kernel
In-Reply-To: <20121219072646.GA30580@us.ibm.com>
Rename EVENT_ATTR() and EVENT_PTR() PMU_EVENT_ATTR() and PMU_EVENT_PTR().
Make them global so they are available to all architectures.
Further to allow architectures flexibility, have PMU_EVENT_PTR() pass in the
variable name as a parameter.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
arch/x86/kernel/cpu/perf_event.c | 17 +++++------------
include/linux/perf_event.h | 13 +++++++++++++
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 4428fd1..24bc505 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1316,11 +1316,6 @@ static struct attribute_group x86_pmu_format_group = {
.attrs = NULL,
};
-struct perf_pmu_events_attr {
- struct device_attribute attr;
- u64 id;
-};
-
/*
* Remove all undefined events (x86_pmu.event_map(id) == 0)
* out of events_attr attributes.
@@ -1351,14 +1346,12 @@ static ssize_t events_sysfs_show(struct device *dev, struct device_attribute *at
return x86_pmu.events_sysfs_show(page, config);
}
-#define EVENT_VAR(_id) event_attr_##_id
-#define EVENT_PTR(_id) &event_attr_##_id.attr.attr
+#define EVENT_VAR(_id) event_attr_##_id
+#define EVENT_ID(_id) PERF_COUNT_HW_##_id
+#define EVENT_PTR(_id) PMU_EVENT_PTR(EVENT_VAR(_id))
-#define EVENT_ATTR(_name, _id) \
-static struct perf_pmu_events_attr EVENT_VAR(_id) = { \
- .attr = __ATTR(_name, 0444, events_sysfs_show, NULL), \
- .id = PERF_COUNT_HW_##_id, \
-};
+#define EVENT_ATTR(_name, _id) \
+ PMU_EVENT_ATTR(_name, EVENT_VAR(_id), EVENT_ID(_id), events_sysfs_show)
EVENT_ATTR(cpu-cycles, CPU_CYCLES );
EVENT_ATTR(instructions, INSTRUCTIONS );
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 6bfb2fa..31692cb 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -817,6 +817,19 @@ do { \
} while (0)
+struct perf_pmu_events_attr {
+ struct device_attribute attr;
+ u64 id;
+};
+
+#define PMU_EVENT_PTR(_var) &_var.attr.attr
+
+#define PMU_EVENT_ATTR(_name, _var, _id, _show) \
+static struct perf_pmu_events_attr _var = { \
+ .attr = __ATTR(_name, 0444, _show, NULL), \
+ .id = _id, \
+};
+
#define PMU_FORMAT_ATTR(_name, _format) \
static ssize_t \
_name##_show(struct device *dev, \
--
1.7.1
^ permalink raw reply related
* [PATCH 1/5] perf/Power7: Use macros to identify perf events
From: Sukadev Bhattiprolu @ 2012-12-19 7:26 UTC (permalink / raw)
To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, Anton Blanchard, Jiri Olsa,
robert.richter, linuxppc-dev, linux-kernel
Cc: sukadev
Define and use macros to identify perf events codes This would make it
easier and more readable when these event codes need to be used in more
than one place.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
arch/powerpc/perf/power7-pmu.c | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/perf/power7-pmu.c b/arch/powerpc/perf/power7-pmu.c
index 441af08..44e70d2 100644
--- a/arch/powerpc/perf/power7-pmu.c
+++ b/arch/powerpc/perf/power7-pmu.c
@@ -51,6 +51,18 @@
#define MMCR1_PMCSEL_MSK 0xff
/*
+ * Power7 event codes.
+ */
+#define PME_PM_CYC 0x1e
+#define PME_PM_GCT_NOSLOT_CYC 0x100f8
+#define PME_PM_CMPLU_STALL 0x4000a
+#define PME_PM_INST_CMPL 0x2
+#define PME_PM_LD_REF_L1 0xc880
+#define PME_PM_LD_MISS_L1 0x400f0
+#define PME_PM_BRU_FIN 0x10068
+#define PME_PM_BRU_MPRED 0x400f6
+
+/*
* Layout of constraint bits:
* 6666555555555544444444443333333333222222222211111111110000000000
* 3210987654321098765432109876543210987654321098765432109876543210
@@ -296,14 +308,14 @@ static void power7_disable_pmc(unsigned int pmc, unsigned long mmcr[])
}
static int power7_generic_events[] = {
- [PERF_COUNT_HW_CPU_CYCLES] = 0x1e,
- [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 0x100f8, /* GCT_NOSLOT_CYC */
- [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 0x4000a, /* CMPLU_STALL */
- [PERF_COUNT_HW_INSTRUCTIONS] = 2,
- [PERF_COUNT_HW_CACHE_REFERENCES] = 0xc880, /* LD_REF_L1_LSU*/
- [PERF_COUNT_HW_CACHE_MISSES] = 0x400f0, /* LD_MISS_L1 */
- [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 0x10068, /* BRU_FIN */
- [PERF_COUNT_HW_BRANCH_MISSES] = 0x400f6, /* BR_MPRED */
+ [PERF_COUNT_HW_CPU_CYCLES] = PME_PM_CYC,
+ [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = PME_PM_GCT_NOSLOT_CYC,
+ [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = PME_PM_CMPLU_STALL,
+ [PERF_COUNT_HW_INSTRUCTIONS] = PME_PM_INST_CMPL,
+ [PERF_COUNT_HW_CACHE_REFERENCES] = PME_PM_LD_REF_L1,
+ [PERF_COUNT_HW_CACHE_MISSES] = PME_PM_LD_MISS_L1,
+ [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = PME_PM_BRU_FIN,
+ [PERF_COUNT_HW_BRANCH_MISSES] = PME_PM_BRU_MPRED,
};
#define C(x) PERF_COUNT_HW_CACHE_##x
--
1.7.1
^ permalink raw reply related
* [PATCH] powerpc: Add support for context switching the TAR register
From: Ian Munsie @ 2012-12-19 6:03 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Michael Neuling, linuxppc-dev, Ian Munsie, Matt Evans
From: Ian Munsie <imunsie@au1.ibm.com>
This patch adds support for enabling and context switching the Target
Address Register in Power8. The TAR is a new special purpose register
that can be used for computed branches with the bctar[l] (branch
conditional to TAR) instruction in the same manner as the count and link
registers.
Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Matt Evans <matt@ozlabs.org>
---
arch/powerpc/include/asm/cputable.h | 3 ++-
arch/powerpc/include/asm/processor.h | 1 +
arch/powerpc/include/asm/reg.h | 3 +++
arch/powerpc/kernel/asm-offsets.c | 1 +
arch/powerpc/kernel/cpu_setup_power.S | 7 +++++++
arch/powerpc/kernel/entry_64.S | 16 ++++++++++++++++
6 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 74458e69..cbbec56a 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -172,6 +172,7 @@ extern const char *powerpc_base_platform;
#define CPU_FTR_ICSWX LONG_ASM_CONST(0x1000000000000000)
#define CPU_FTR_VMX_COPY LONG_ASM_CONST(0x2000000000000000)
#define CPU_FTR_TM LONG_ASM_CONST(0x4000000000000000)
+#define CPU_FTR_BCTAR LONG_ASM_CONST(0x8000000000000000)
#ifndef __ASSEMBLY__
@@ -417,7 +418,7 @@ extern const char *powerpc_base_platform;
CPU_FTR_DSCR | CPU_FTR_SAO | \
CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \
- CPU_FTR_DBELL | CPU_FTR_TM_COMP)
+ CPU_FTR_DBELL | CPU_FTR_TM_COMP | CPU_FTR_BCTAR)
#define CPU_FTRS_CELL (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 8b2bf7a..cbbd82d 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -275,6 +275,7 @@ struct thread_struct {
unsigned long dscr;
int dscr_inherit;
#endif
+ unsigned long tar;
};
#define ARCH_MIN_TASKALIGN 16
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 5c9fe38..1fa8a56 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -257,6 +257,9 @@
#define SPRN_HRMOR 0x139 /* Real mode offset register */
#define SPRN_HSRR0 0x13A /* Hypervisor Save/Restore 0 */
#define SPRN_HSRR1 0x13B /* Hypervisor Save/Restore 1 */
+#define SPRN_FSCR 0x099 /* Facility Status & Control Register */
+#define FSCR_TAR (1<<8) /* Enable Target Adress Register */
+#define SPRN_TAR 0x32f /* Target Address Register */
#define SPRN_LPCR 0x13E /* LPAR Control Register */
#define LPCR_VPM0 (1ul << (63-0))
#define LPCR_VPM1 (1ul << (63-1))
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 42a4243..77e941e 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -145,6 +145,7 @@ int main(void)
DEFINE(TM_FRAME_SIZE, STACK_FRAME_OVERHEAD +
sizeof(struct pt_regs) + 16);
#endif /* CONFIG_TRANSACTIONAL_MEM */
+ DEFINE(THREAD_TAR, offsetof(struct thread_struct, tar));
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));
diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S
index 57cf140..d29facb 100644
--- a/arch/powerpc/kernel/cpu_setup_power.S
+++ b/arch/powerpc/kernel/cpu_setup_power.S
@@ -56,6 +56,7 @@ _GLOBAL(__setup_cpu_power8)
mfspr r3,SPRN_LPCR
oris r3, r3, LPCR_AIL_3@h
bl __init_LPCR
+ bl __init_FSCR
bl __init_TLB
mtlr r11
blr
@@ -112,6 +113,12 @@ __init_LPCR:
isync
blr
+__init_FSCR:
+ mfspr r3,SPRN_FSCR
+ ori r3,r3,FSCR_TAR
+ mtspr SPRN_FSCR,r3
+ blr
+
__init_TLB:
/* Clear the TLB */
li r6,128
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index b3590c3..253885d 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -451,6 +451,17 @@ END_FTR_SECTION_IFSET(CPU_FTR_DSCR)
std r23,_CCR(r1)
std r1,KSP(r3) /* Set old stack pointer */
+BEGIN_FTR_SECTION
+ /*
+ * Back up the TAR across context switches. Note that the TAR is not
+ * available for use in the kernel. (To provide this, the TAR should
+ * be backed up/restored on exception entry/exit instead, and be in
+ * pt_regs. FIXME, this should be in pt_regs anyway (for debug).)
+ */
+ mfspr r0,SPRN_TAR
+ std r0,THREAD_TAR(r3)
+END_FTR_SECTION_IFSET(CPU_FTR_BCTAR)
+
#ifdef CONFIG_SMP
/* We need a sync somewhere here to make sure that if the
* previous task gets rescheduled on another CPU, it sees all
@@ -533,6 +544,11 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
mr r1,r8 /* start using new stack pointer */
std r7,PACAKSAVE(r13)
+BEGIN_FTR_SECTION
+ ld r0,THREAD_TAR(r4)
+ mtspr SPRN_TAR,r0
+END_FTR_SECTION_IFSET(CPU_FTR_BCTAR)
+
#ifdef CONFIG_ALTIVEC
BEGIN_FTR_SECTION
ld r0,THREAD_VRSAVE(r4)
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH 1/3] powerpc/book3e: load critical/machine/debug exception stack
From: Tabi Timur-B04825 @ 2012-12-18 22:10 UTC (permalink / raw)
To: Tiejun Chen
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
jason.wessel@windriver.com
In-Reply-To: <1351147410-17452-1-git-send-email-tiejun.chen@windriver.com>
On Thu, Oct 25, 2012 at 1:43 AM, Tiejun Chen <tiejun.chen@windriver.com> wr=
ote:
> We always alloc critical/machine/debug check exceptions. This is
> different from the normal exception. So we should load these exception
> stack properly like we did for booke.
Tiejun,
I'm a little confused by these patches, because the actual critical
exception handlers are still commented out:
/* Critical Input Interrupt */
START_EXCEPTION(critical_input);
CRIT_EXCEPTION_PROLOG(0x100, BOOKE_INTERRUPT_CRITICAL,
PROLOG_ADDITION_NONE)
// EXCEPTION_COMMON(0x100, PACA_EXCRIT, INTS_DISABLE)
// bl special_reg_save_crit
// CHECK_NAPPING();
// addi r3,r1,STACK_FRAME_OVERHEAD
// bl .critical_exception
// b ret_from_crit_except
b .
Are you working on fixing this? I'm trying to fix it, too, but I
think you're way ahead of me.
--=20
Timur Tabi
Linux kernel developer at Freescale=
^ permalink raw reply
* Re: [git pull] Please pull powerpc.git next branch
From: Linus Torvalds @ 2012-12-18 18:02 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, Linux Kernel list
In-Reply-To: <1355787094.5397.30.camel@pasglop>
On Mon, Dec 17, 2012 at 3:31 PM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
> On Sat, 2012-12-15 at 07:44 +1100, Benjamin Herrenschmidt wrote:
>> Hi Linus !
>>
>> Finally managed to get my head away from some other distractions
>> to put this pull request together, sorry for the lateness :-)
>>
>> The main highlight is probably some base POWER8 support. There's
>> more to come such as transactional memory support but that will
>> wait for the next one. (next merge window)
>>
>> Overall it's pretty quiet, or rather I've been pretty poor at
>> picking things up from patchwork and reviewing them this time
>> around and Kumar no better on the FSL side it seems...
>
> So it looks like I'm an idiot and totally failed to put your email
> address on the CC list of that pull request :-)
.. yeah, that helps.
Anyway, I've pulled it in, but got a conflict on the kernel_thread
cleanups from Al. And since the conflict was in the powerpc assembly
code that I don't really know the details of, I did the
straightforward resolve of it, but I'd like you to check it out.
(I haven't pushed it out yet, I'm waiting for the allmodconfig to
finish compiling, so if you see this email quickly, but don't see the
powerpc merge yet, just wait a few minutes)
Linus
^ permalink raw reply
* Re: [PATCH] powerpc: POWER7 optimised memcpy using VMX and enhanced prefetch
From: Peter Bergner @ 2012-12-18 16:31 UTC (permalink / raw)
To: Jimi Xenidis; +Cc: paulus, linuxppc-dev, Kumar Gala, Anton Blanchard
In-Reply-To: <16080DCD-0E42-43E9-93E3-D3076637DCB1@pobox.com>
On Tue, 2012-12-18 at 07:28 -0600, Jimi Xenidis wrote:
> On Dec 17, 2012, at 6:26 PM, Peter Bergner <bergner@vnet.ibm.com> wrote:
> > Jimi, are you using an "old" binutils from before my patch that
> > changed the operand order for these types of instructions?
> >
> > http://sourceware.org/ml/binutils/2009-02/msg00044.html
>
> Actually, this confused me as well, that embedded has the same instruction
> encoding but different mnemonic.
The mnemonic is the same (ie, dcbtst), and yes, the encoding is the same.
All that is different is the accepted operand ordering...and yes, it is
very unfortunate the operand ordering is different between embedded and
server. :(
> I was under the impression that the assembler made no instruction decisions
> based on CPU. So your only hint would be that '0b' prefix.
> Does AS even see that?
GAS definitely makes decisions based on CPU (ie, -m<cpu> option). Below is
the GAS code used in recognizing the dcbtst instruction. This shows that
the "server" operand ordering is enabled for POWER4 and later cpus while
the "embedded" operand ordering is enabled for pre POWER4 cpus (yes, not
exactly a server versus embedded trigger, but that's we agreed on to
mitigate breaking any old asm code out there).
{"dcbtst", X(31,246), X_MASK, POWER4, PPCNONE, {RA0, RB, CT}},
{"dcbtst", X(31,246), X_MASK, PPC|PPCVLE, POWER4, {CT, RA0, RB}},
GAS doesn't look at how the operands are written to try and guess what
operand ordering you are attempting to use. Rather, it knows what ordering
it expects and the values had better match that ordering.
Peter
^ permalink raw reply
* RE: [PATCH] powerpc: POWER7 optimised memcpy using VMX and enhanced prefetch
From: David Laight @ 2012-12-18 14:14 UTC (permalink / raw)
To: Jimi Xenidis, Peter Bergner
Cc: Kumar Gala, linuxppc-dev, paulus, Anton Blanchard
In-Reply-To: <16080DCD-0E42-43E9-93E3-D3076637DCB1@pobox.com>
> >> dcbt r0,r8,0b01010 /* GO */
> >> .machine pop
> >
> > Jimi, are you using an "old" binutils from before my patch that
> > changed the operand order for these types of instructions?
> >
> > http://sourceware.org/ml/binutils/2009-02/msg00044.html
>=20
> Actually, this confused me as well, that embedded has the same
> instruction encoding but different mnemonic.
That it utterly horrid!
> I was under the impression that the assembler made no instruction =
decisions based on CPU.
> So your only hint would be that '0b' prefix.
> Does AS even see that?
Or maybe see the 'r' prefix.
I know they tend to be absent making ppc asm even more unreadable.
It isn't as though the mnemonics were designed at a time when
the source file size or difference in decode time (or code space)
would be significant.
Otherwise it is a complete recipe for disaster.
David
^ permalink raw reply
* Re: [PATCH] powerpc: POWER7 optimised memcpy using VMX and enhanced prefetch
From: Jimi Xenidis @ 2012-12-18 13:28 UTC (permalink / raw)
To: Peter Bergner; +Cc: paulus, linuxppc-dev, Kumar Gala, Anton Blanchard
In-Reply-To: <1355790373.5180.26.camel@otta>
On Dec 17, 2012, at 6:26 PM, Peter Bergner <bergner@vnet.ibm.com> wrote:
> On Mon, 2012-12-17 at 22:33 +1100, Anton Blanchard wrote:
>> Hi Jimi,
>>=20
>>> I know this is a little late, but shouldn't these power7 specific
>>> thingies be in "obj-$(CONFIG_PPC_BOOK3S_64)". The reason I ask is
>>> that my compiler pukes on "dcbtst" and as I deal with that I wanted
>>> to point this out.
>>=20
>> I guess we could do that. It's a bit strange your assembler is
>> complaining about the dcbtst instructions since we wrap them with
>> power4:
>>=20
>> .machine push
>> .machine "power4"
>> dcbt r0,r4,0b01000
>> dcbt r0,r7,0b01010
>> dcbtst r0,r9,0b01000
>> dcbtst r0,r10,0b01010
>> eieio
>> dcbt r0,r8,0b01010 /* GO */
>> .machine pop
>=20
> Jimi, are you using an "old" binutils from before my patch that
> changed the operand order for these types of instructions?
>=20
> http://sourceware.org/ml/binutils/2009-02/msg00044.html
Actually, this confused me as well, that embedded has the same =
instruction encoding but different mnemonic.
I was under the impression that the assembler made no instruction =
decisions based on CPU.
So your only hint would be that '0b' prefix.
Does AS even see that?
If not, then without a _normalizing_ macro, I think will need that =
obj-$(CONFIG_PPC_BOOK3S_64) and .S files with the two can never be =
shared.
-jx
>=20
> Peter
>=20
>=20
^ permalink raw reply
* Re: [PATCH] powerpc: POWER7 optimised memcpy using VMX and enhanced prefetch
From: Jimi Xenidis @ 2012-12-18 13:21 UTC (permalink / raw)
To: Anton Blanchard; +Cc: Kumar Gala, paulus, linuxppc-dev
In-Reply-To: <20121217223333.6cb00476@kryten>
On Dec 17, 2012, at 5:33 AM, Anton Blanchard <anton@samba.org> wrote:
>=20
> Hi Jimi,
>=20
>> I know this is a little late, but shouldn't these power7 specific
>> thingies be in "obj-$(CONFIG_PPC_BOOK3S_64)". The reason I ask is
>> that my compiler pukes on "dcbtst" and as I deal with that I wanted
>> to point this out.
>=20
> I guess we could do that.
I think it is the right idea since it is unclear that your optimizations =
would actually help an embedded system where most of these cache =
prefetches are NOPs and only wait decode/dispatch cycles.
> It's a bit strange your assembler is
> complaining about the dcbtst instructions since we wrap them with
> power4:
Not really, the binutils is a little old (RHEL 6.2), unfortunately it =
_is_ the toolchain most people are using at the moment.
It will take me a while to get everyone using newer ones since most are =
scientists using the packages they get.
My suggestion was really for correctness, My current patches for BG/Q =
introduce a macro replacement.
-jx
>=20
> .machine push
> .machine "power4"
> dcbt r0,r4,0b01000
> dcbt r0,r7,0b01010
> dcbtst r0,r9,0b01000
> dcbtst r0,r10,0b01010
> eieio
> dcbt r0,r8,0b01010 /* GO */
> .machine pop
>=20
> Anton
^ permalink raw reply
* Re: [PATCH]powerpc: Corrected include header path in kvm_para.h
From: Alexander Graf @ 2012-12-18 12:21 UTC (permalink / raw)
To: Bharat Bhushan; +Cc: Bharat Bhushan, linuxppc-dev, kvm-ppc, kvm
In-Reply-To: <1355829688-32545-1-git-send-email-bharat.bhushan@freescale.com>
On 18.12.2012, at 12:21, Bharat Bhushan wrote:
> The include/uapi/asm/kvm_para.h includes
> <include/uapi/asm/epapr_hcalls.h> but the correct reference
> should be <include/asm/epapr_hcalls.h> as this is the place
> where make install_header installs the header files for
> userspace.
>=20
> Signed-off-by: Bharat Bhushan <bharat.bhushan@freescale.com>
Thanks, applied to kvm-ppc-next (with CC to stable@vger).
Alex
> ---
> arch/powerpc/include/uapi/asm/kvm_para.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>=20
> diff --git a/arch/powerpc/include/uapi/asm/kvm_para.h =
b/arch/powerpc/include/uapi/asm/kvm_para.h
> index ed0e025..e3af328 100644
> --- a/arch/powerpc/include/uapi/asm/kvm_para.h
> +++ b/arch/powerpc/include/uapi/asm/kvm_para.h
> @@ -78,7 +78,7 @@ struct kvm_vcpu_arch_shared {
>=20
> #define KVM_HCALL_TOKEN(num) _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, =
num)
>=20
> -#include <uapi/asm/epapr_hcalls.h>
> +#include <asm/epapr_hcalls.h>
>=20
> #define KVM_FEATURE_MAGIC_PAGE 1
>=20
> --=20
> 1.7.0.4
>=20
>=20
^ permalink raw reply
* [PATCH]powerpc: Corrected include header path in kvm_para.h
From: Bharat Bhushan @ 2012-12-18 11:21 UTC (permalink / raw)
To: linuxppc-dev, kvm, kvm-ppc, agraf; +Cc: Bharat Bhushan
The include/uapi/asm/kvm_para.h includes
<include/uapi/asm/epapr_hcalls.h> but the correct reference
should be <include/asm/epapr_hcalls.h> as this is the place
where make install_header installs the header files for
userspace.
Signed-off-by: Bharat Bhushan <bharat.bhushan@freescale.com>
---
arch/powerpc/include/uapi/asm/kvm_para.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/include/uapi/asm/kvm_para.h b/arch/powerpc/include/uapi/asm/kvm_para.h
index ed0e025..e3af328 100644
--- a/arch/powerpc/include/uapi/asm/kvm_para.h
+++ b/arch/powerpc/include/uapi/asm/kvm_para.h
@@ -78,7 +78,7 @@ struct kvm_vcpu_arch_shared {
#define KVM_HCALL_TOKEN(num) _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, num)
-#include <uapi/asm/epapr_hcalls.h>
+#include <asm/epapr_hcalls.h>
#define KVM_FEATURE_MAGIC_PAGE 1
--
1.7.0.4
^ permalink raw reply related
* Re: tqm5200s phy link toggles between up and down
From: Johannes Braun @ 2012-12-18 11:01 UTC (permalink / raw)
Cc: linuxppc-dev
In-Reply-To: <50D03FCE.9060003@grandegger.com>
>> This is not really a new kernel.
Yes this is right. But it is the first Kernel which supports our
wireless card without problems.
>> Is it a PHY or a switch? If is a switch you need to configure a fixed
>> link to the switch. This can be done via dts file.
According to the marvell website it is a switch with integrated phy.
> Here is an example:
> http://lxr.linux.no/#linux+v3.7.1/arch/powerpc/boot/dts/charon.dts#L129
I had a look at this example and compared it to my *.dtb file. The
difference was, the fixed-link tag in the section ethernet@3000 { ...
};.
I added "fixed-link = <1 1 100 0 0>;" to my tqm5200.dtb and now it works.
I am new to powerpc development and I hope it is ok to ask what this
fixed-link with the numbers "1 1 100 0 0" does? Is it the address to
the PHY?
2012/12/18 Wolfgang Grandegger <wg@grandegger.com>:
> On 12/18/2012 10:57 AM, Wolfgang Grandegger wrote:
>> On 12/18/2012 10:44 AM, Johannes Braun wrote:
>>> Hello,
>>>
>>> I hope someone could help me with my problem. Currently I am porting
>>> a new kernel (3.3.8) for a tqm5200s based board.
>>
>> This is not really a new kernel.
>>
>>> The previous kernel was 2.6.23. The new kernel version is needed because
>>> of support for a wireless card.
>>>
>>> The new kernel has problems with my ethernet PHY. The problem occurs only
>>> with our hardware. Not with the TQ eval board.
>>> The eval board uses a Intel PHY. Our board uses a Marvel 88E6085 PHY.
>>
>> Is it a PHY or a switch? If is a switch you need to configure a fixed
>> link to the switch. This can be done via dts file.
>
> Here is an example:
>
> http://lxr.linux.no/#linux+v3.7.1/arch/powerpc/boot/dts/charon.dts#L129
>
>> Note the the DSA also supports this chip.
>
> See http://lwn.net/Articles/302333/. But I think it lacks device tree
> support.
>
> Wolfgang.
>
^ permalink raw reply
* Re: tqm5200s phy link toggles between up and down
From: Wolfgang Grandegger @ 2012-12-18 9:57 UTC (permalink / raw)
To: Johannes Braun; +Cc: linuxppc-dev
In-Reply-To: <CADwvPCuBcSnXz1LYYf2ydfdCcz1tV5eBZufEDh5LCaZrmY7W4Q@mail.gmail.com>
On 12/18/2012 10:44 AM, Johannes Braun wrote:
> Hello,
>
> I hope someone could help me with my problem. Currently I am porting
> a new kernel (3.3.8) for a tqm5200s based board.
This is not really a new kernel.
> The previous kernel was 2.6.23. The new kernel version is needed because
> of support for a wireless card.
>
> The new kernel has problems with my ethernet PHY. The problem occurs only
> with our hardware. Not with the TQ eval board.
> The eval board uses a Intel PHY. Our board uses a Marvel 88E6085 PHY.
Is it a PHY or a switch? If is a switch you need to configure a fixed
link to the switch. This can be done via dts file.
Note the the DSA also supports this chip.
Wolfgang.
^ permalink raw reply
* Re: tqm5200s phy link toggles between up and down
From: Wolfgang Grandegger @ 2012-12-18 10:05 UTC (permalink / raw)
To: Johannes Braun; +Cc: linuxppc-dev
In-Reply-To: <50D03E16.1080903@grandegger.com>
On 12/18/2012 10:57 AM, Wolfgang Grandegger wrote:
> On 12/18/2012 10:44 AM, Johannes Braun wrote:
>> Hello,
>>
>> I hope someone could help me with my problem. Currently I am porting
>> a new kernel (3.3.8) for a tqm5200s based board.
>
> This is not really a new kernel.
>
>> The previous kernel was 2.6.23. The new kernel version is needed because
>> of support for a wireless card.
>>
>> The new kernel has problems with my ethernet PHY. The problem occurs only
>> with our hardware. Not with the TQ eval board.
>> The eval board uses a Intel PHY. Our board uses a Marvel 88E6085 PHY.
>
> Is it a PHY or a switch? If is a switch you need to configure a fixed
> link to the switch. This can be done via dts file.
Here is an example:
http://lxr.linux.no/#linux+v3.7.1/arch/powerpc/boot/dts/charon.dts#L129
> Note the the DSA also supports this chip.
See http://lwn.net/Articles/302333/. But I think it lacks device tree
support.
Wolfgang.
^ permalink raw reply
* tqm5200s phy link toggles between up and down
From: Johannes Braun @ 2012-12-18 9:44 UTC (permalink / raw)
To: linuxppc-dev
Hello,
I hope someone could help me with my problem. Currently I am porting
a new kernel (3.3.8) for a tqm5200s based board.
The previous kernel was 2.6.23. The new kernel version is needed because
of support for a wireless card.
The new kernel has problems with my ethernet PHY. The problem occurs only
with our hardware. Not with the TQ eval board.
The eval board uses a Intel PHY. Our board uses a Marvel 88E6085 PHY.
I have tested the new kernel on the eval board and everything runs fine.
But After booting the kernel on our hardware, the ethernet connection is
going up and down and loops between these two states.
This is the log output:
[ 38.608305] PHY: f0003000:00 - Link is Down
[ 41.708310] PHY: f0003000:00 - Link is Up - 10/Half
[ 43.744304] PHY: f0003000:00 - Link is Down
[ 46.844309] PHY: f0003000:00 - Link is Up - 10/Half
I also had a look inside the driver in
Drivers/net/ethernet/freescale/fec_mpc52xx.c
and made a printk output to the link adjust method,
which is called everytime before the link is going down.
/* based on generic_adjust_link from fs_enet-main.c */
static void
mpc52xx_fec_adjust_link(struct net_device *dev)
{
struct mpc52xx_fec_priv *priv = netdev_priv(dev);
struct phy_device *phydev = priv->phydev;
int new_state = 0;
printk( KERN_INFO "%s->%s: entering...",
__FILE__, __func__ );
if (phydev->link != PHY_DOWN) {
if (phydev->duplex != priv->duplex) {
struct mpc52xx_fec __iomem *fec = priv->fec;
u32 rcntrl;
u32 tcntrl;
...
...
This is the output with the above printk:
[ 35.589485] PHY: f0003000:00 - Link is Down
[ 40.752753] drivers/net/ethernet/freescale/fec_mpc52xx.c
->mpc52xx_fec_adjust_link: entering...
[ 40.761494] PHY: f0003000:00 - Link is Up - 10/Half
[ 42.796746] drivers/net/ethernet/freescale/fec_mpc52xx.c
->mpc52xx_fec_adjust_link: entering...
[ 42.805485] PHY: f0003000:00 - Link is Down
[ 49.000755] drivers/net/ethernet/freescale/fec_mpc52xx.c
->mpc52xx_fec_adjust_link: entering...
[ 49.009497] PHY: f0003000:00 - Link is Up - 10/Half
As I noticed the problem occurs also with a 2.6.24 kernel.
Seems that the driver was rewritten and moved from drivers/net/fec_mpc52xx/
to drivers/net/ethernet/freescale/fec_mpc52xx.c.
I am note shure where to search for the problem. The PHY link seems to be in
some kind of auto-negotiating loop of going up and down? Has anyone had this
problem before, or does someone has a tip to fix this problem?
Best regards
Johannes
^ permalink raw reply
* Re: [PATCH] powerpc: POWER7 optimised memcpy using VMX and enhanced prefetch
From: Peter Bergner @ 2012-12-18 0:26 UTC (permalink / raw)
To: Jimi Xenidis; +Cc: paulus, linuxppc-dev, Kumar Gala, Anton Blanchard
In-Reply-To: <20121217223333.6cb00476@kryten>
On Mon, 2012-12-17 at 22:33 +1100, Anton Blanchard wrote:
> Hi Jimi,
>
> > I know this is a little late, but shouldn't these power7 specific
> > thingies be in "obj-$(CONFIG_PPC_BOOK3S_64)". The reason I ask is
> > that my compiler pukes on "dcbtst" and as I deal with that I wanted
> > to point this out.
>
> I guess we could do that. It's a bit strange your assembler is
> complaining about the dcbtst instructions since we wrap them with
> power4:
>
> .machine push
> .machine "power4"
> dcbt r0,r4,0b01000
> dcbt r0,r7,0b01010
> dcbtst r0,r9,0b01000
> dcbtst r0,r10,0b01010
> eieio
> dcbt r0,r8,0b01010 /* GO */
> .machine pop
Jimi, are you using an "old" binutils from before my patch that
changed the operand order for these types of instructions?
http://sourceware.org/ml/binutils/2009-02/msg00044.html
Peter
^ permalink raw reply
* [git pull] Please pull powerpc.git next branch
From: Benjamin Herrenschmidt @ 2012-12-17 23:31 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev, Linux Kernel list
In-Reply-To: <1355517897.19932.136.camel@pasglop>
On Sat, 2012-12-15 at 07:44 +1100, Benjamin Herrenschmidt wrote:
> Hi Linus !
>
> Finally managed to get my head away from some other distractions
> to put this pull request together, sorry for the lateness :-)
>
> The main highlight is probably some base POWER8 support. There's
> more to come such as transactional memory support but that will
> wait for the next one. (next merge window)
>
> Overall it's pretty quiet, or rather I've been pretty poor at
> picking things up from patchwork and reviewing them this time
> around and Kumar no better on the FSL side it seems...
So it looks like I'm an idiot and totally failed to put your email
address on the CC list of that pull request :-)
This is an updated version with Anatolij 52xx which I hadn't merged back
then but have now (it's all be in -next for a while).
Cheers,
Ben.
The following changes since commit b69f0859dc8e633c5d8c06845811588fe17e68b3:
Linux 3.7-rc8 (2012-12-03 11:22:37 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next
for you to fetch changes up to 376bddd34433065aeb9b9a140870537feecf90ef:
Merge remote-tracking branch 'agust/next' into next (2012-12-18 10:22:27 +1100)
----------------------------------------------------------------
Akinobu Mita (3):
powerpc/iommu: Use bitmap library
powerpc: Remove BITOP_MASK and BITOP_WORD from asm/bitops.h
powerpc: Use asm-generic/bitops/le.h
Andreas Schwab (1):
powerpc/powermac/cpufreq_32: Set non-infinite transition time for 7447A driver
Anton Blanchard (3):
powerpc: Move most of setup.h out of uapi
powerpc: Remove stale function prototypes from setup.h
powerpc: Fix CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n build
Aravinda Prasad (1):
powerpc/ptrace: Enable hardware breakpoint upon re-registering
Benjamin Herrenschmidt (6):
powerpc/powernv: Fix OPAL debug entry
Merge branch 'dt' into next
Merge branch 'merge' into next
Merge remote-tracking branch 'kumar/next' into next
powerpc+of: Rename and fix OF reconfig notifier error inject module
Merge remote-tracking branch 'agust/next' into next
Dan Horák (1):
fbdev: Add GXT4000P and GXT6500P support to the gxt4500 driver
Gavin Shan (1):
powerpc/pnv: Avoid bogus output
Ian Munsie (5):
powerpc: Add set_mode hcall
powerpc: Add wrappers to enable/disable relocation on exceptions
powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate function
powerpc: Enable relocation on during exceptions at boot
powerpc: Disable relocation on exceptions when kexecing
Jia Hongtao (1):
powerpc/fsl-pci: Add PCI controller ATMU PM support
JoonSoo Kim (1):
powerpc: Change free_bootmem() to kfree()
Julia Lawall (1):
powerpc/rtas_flash: Eliminate possible double free
K.Prasad (1):
powerpc/hw-breakpoint: Use generic hw-breakpoint interfaces for new PPC ptrace flags
Li Zhong (1):
powerpc: Fix MAX_STACK_TRACE_ENTRIES too low warning !
Matthew McClintock (1):
powerpc: dtc is required to build dtb files
Michael Ellerman (12):
powerpc/udbg: Remove unused udbg_read()
powerpc/xmon: Remove unused xmon_expect() & xmon_read_poll()
powerpc/xmon: Remove empty xmon_map_scc()
powerpc/xmon: Make xmon_getchar() static
powerpc/xmon: Merge start.c into nonstdio.c
powerpc/xmon: Remove renaming #defines of scanhex() and skipbl()
powerpc/xmon: Remove unused #defines
powerpc/xmon: Use STACK_FRAME_OVERHEAD in xmon_show_stack()
powerpc/xmon: Fiddle xmon_depth_to_print logic in xmon_show_stack()
powerpc/xmon: Fallback to printk() in xmon_printf() if udbg is not setup
powerpc: Remove no longer used ppc_md.idle_loop()
powerpc/perf: Add missing L2 constraint handling in Power7 PMU
Michael Neuling (16):
powerpc/ptrace: Fix spelling mistake
powerpc/ptrace: Remove unused addr parameter in ppc_del_hwdebug()
powerpc: make POWER7 setup code name generic
powerpc: Add POWER8 setup code
powerpc: POWER8 cputable entry
powerpc: Fix denorm symbol name
powerpc/pseries: Update ibm,architecture.vec for PAPR 2.7/POWER8
powerpc: Add POWER8 architected mode to cputable
powerpc: Whitespace changes in exception64s.S
powerpc: Remove unessessary 0x3000 location enforcement
powerpc: Make load_hander handle upto 64k offset
powerpc: Turn syscall handler into macros
powerpc: Add new macros needed for relocation on exceptions
powerpc: Add relocation on exception vector handlers
powerpc: Move initial mfspr LPCR out of __init_LPCR
powerpc: Setup relocation on exceptions for bare metal systems
Nathan Fontenot (6):
powerpc+of: Add /proc device tree updating to of node add/remove
powerpc+of: Move of_drconf_cell struct definition to asm/prom.h
powerpc+of: Add of node/property notification chain for adds and removes
powerpc+of: Rename the drivers/of prom_* functions to of_*
powerpc+of: Remove the pSeries_reconfig.h file
powerpc+of: Export of_reconfig_notifier_[register,unregister]
Nishanth Aravamudan (1):
powerpc/pseries: Double NR_CPUS in defconfig
Srinivas Kandagatla (2):
powerpc/sysdev: Use module_platform_driver macro
powerpc/mpc52xx: use module_platform_driver macro
Stefan Roese (1):
powerpc: mpc5200: Add a3m071 board support
Sukadev Bhattiprolu (1):
powerpc/perf: Use uapi/unistd.h to fix build error
Timur Tabi (3):
drivers/virt: the Freescale hypervisor driver doesn't need to check MSR[GS]
powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI
powerpc/512x: don't compile any platform DIU code if the DIU is not enabled
Tony Breeds (2):
powerpc/47x: Use the new ppc-opcode infrastructure
powerpc: Add asm/debug.h to get powerpc_debugfs_root
Tushar Behera (1):
powerpc/85xx: p1022ds: Use NULL instead of 0 for pointers
Varun Sethi (1):
powerpc/iommu/fsl: Add PAMU bypass enable register to ccsr_guts struct
Wei Yongjun (1):
powerpc/windfarm: Use module_i2c_driver to simplify the code
Xuelin Shi (1):
powerpc/dma/raidengine: add raidengine device
Yang Li (1):
powerpc: Fix typos in Freescale copyright claims
York Sun (1):
powerpc/mpc85xx: Change spin table to cached memory
.../devicetree/bindings/powerpc/fsl/raideng.txt | 81 +++++
Documentation/powerpc/ptrace.txt | 16 +
arch/arm/mach-mxs/mach-mxs.c | 2 +-
arch/powerpc/Makefile | 2 +-
arch/powerpc/boot/dts/a3m071.dts | 144 +++++++++
arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 1 +
arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 6 +
arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi | 85 ++++++
arch/powerpc/configs/pseries_defconfig | 2 +-
arch/powerpc/include/asm/bitops.h | 75 +----
arch/powerpc/include/asm/cputable.h | 12 +-
arch/powerpc/include/asm/dbell.h | 2 +-
arch/powerpc/include/asm/exception-64s.h | 97 +++++-
arch/powerpc/include/asm/firmware.h | 4 +-
arch/powerpc/include/asm/fsl_gtm.h | 2 +-
arch/powerpc/include/asm/fsl_guts.h | 4 +-
arch/powerpc/include/asm/hvcall.h | 23 +-
arch/powerpc/include/asm/immap_qe.h | 2 +-
arch/powerpc/include/asm/machdep.h | 3 -
arch/powerpc/include/asm/mmu.h | 1 +
arch/powerpc/include/asm/pSeries_reconfig.h | 47 ---
arch/powerpc/include/asm/ppc-opcode.h | 6 +-
arch/powerpc/include/asm/prom.h | 16 +
arch/powerpc/include/asm/qe.h | 2 +-
arch/powerpc/include/asm/qe_ic.h | 2 +-
arch/powerpc/include/asm/reg.h | 3 +
arch/powerpc/include/asm/rtas.h | 5 +
arch/powerpc/include/asm/setup.h | 29 ++
arch/powerpc/include/asm/ucc.h | 2 +-
arch/powerpc/include/asm/ucc_fast.h | 2 +-
arch/powerpc/include/asm/ucc_slow.h | 2 +-
arch/powerpc/include/asm/udbg.h | 1 -
arch/powerpc/include/uapi/asm/setup.h | 31 --
arch/powerpc/kernel/Makefile | 2 +-
.../{cpu_setup_power7.S => cpu_setup_power.S} | 32 +-
arch/powerpc/kernel/cputable.c | 38 +++
arch/powerpc/kernel/entry_64.S | 2 +
arch/powerpc/kernel/exceptions-64s.S | 308 ++++++++++++++++----
arch/powerpc/kernel/head_64.S | 6 +-
arch/powerpc/kernel/idle.c | 3 -
arch/powerpc/kernel/iommu.c | 16 +-
arch/powerpc/kernel/machine_kexec.c | 14 +-
arch/powerpc/kernel/machine_kexec_64.c | 8 +-
arch/powerpc/kernel/pci_32.c | 2 +-
arch/powerpc/kernel/prom.c | 7 +-
arch/powerpc/kernel/prom_init.c | 11 +-
arch/powerpc/kernel/ptrace.c | 90 +++++-
arch/powerpc/kernel/rtas.c | 1 -
arch/powerpc/kernel/rtas_flash.c | 4 +-
arch/powerpc/kernel/setup_64.c | 5 +
arch/powerpc/kernel/udbg.c | 23 --
arch/powerpc/mm/numa.c | 12 -
arch/powerpc/mm/tlb_nohash_low.S | 15 +-
arch/powerpc/perf/power7-pmu.c | 17 +-
arch/powerpc/platforms/512x/Kconfig | 1 -
arch/powerpc/platforms/512x/mpc5121_ads.c | 3 +
arch/powerpc/platforms/512x/mpc512x.h | 11 +-
arch/powerpc/platforms/512x/mpc512x_shared.c | 25 +-
arch/powerpc/platforms/52xx/lite5200.c | 2 +-
arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 16 +-
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 8 +-
arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +-
arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +-
arch/powerpc/platforms/83xx/mpc836x_rdk.c | 2 +-
arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 +-
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +-
arch/powerpc/platforms/85xx/p1022_ds.c | 8 +-
arch/powerpc/platforms/85xx/smp.c | 49 +++-
arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +
arch/powerpc/platforms/powermac/cpufreq_32.c | 5 +-
arch/powerpc/platforms/powernv/pci-ioda.c | 25 +-
arch/powerpc/platforms/ps3/os-area.c | 6 +-
arch/powerpc/platforms/pseries/dlpar.c | 34 +--
arch/powerpc/platforms/pseries/firmware.c | 1 +
arch/powerpc/platforms/pseries/hotplug-cpu.c | 8 +-
arch/powerpc/platforms/pseries/hotplug-memory.c | 60 ++--
arch/powerpc/platforms/pseries/iommu.c | 10 +-
arch/powerpc/platforms/pseries/mobility.c | 4 +-
arch/powerpc/platforms/pseries/plpar_wrappers.h | 31 ++
arch/powerpc/platforms/pseries/reconfig.c | 119 +-------
arch/powerpc/platforms/pseries/setup.c | 77 ++++-
arch/powerpc/platforms/pseries/smp.c | 1 -
arch/powerpc/sysdev/fsl_gtm.c | 2 +-
arch/powerpc/sysdev/fsl_pci.c | 37 ++-
arch/powerpc/sysdev/pmi.c | 13 +-
arch/powerpc/sysdev/qe_lib/qe.c | 2 +-
arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +-
arch/powerpc/sysdev/qe_lib/qe_ic.h | 2 +-
arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +-
arch/powerpc/sysdev/qe_lib/ucc.c | 2 +-
arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2 +-
arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2 +-
arch/powerpc/sysdev/qe_lib/usb.c | 2 +-
arch/powerpc/xmon/Makefile | 2 +-
arch/powerpc/xmon/nonstdio.c | 53 ++--
arch/powerpc/xmon/nonstdio.h | 6 -
arch/powerpc/xmon/start.c | 34 ---
arch/powerpc/xmon/xmon.c | 26 +-
drivers/crypto/nx/nx-842.c | 20 +-
drivers/crypto/nx/nx.c | 1 -
drivers/infiniband/hw/ehca/hcp_if.c | 20 --
drivers/macintosh/smu.c | 2 +-
drivers/macintosh/windfarm_fcu_controls.c | 14 +-
drivers/macintosh/windfarm_lm75_sensor.c | 14 +-
drivers/macintosh/windfarm_max6690_sensor.c | 13 +-
drivers/macintosh/windfarm_smu_sat.c | 13 +-
drivers/net/ethernet/ibm/ehea/ehea_phyp.h | 20 --
drivers/of/base.c | 142 ++++++++-
drivers/video/Kconfig | 8 +-
drivers/video/gxt4500.c | 15 +-
drivers/virt/fsl_hypervisor.c | 3 -
include/linux/of.h | 29 +-
lib/Kconfig.debug | 10 +-
lib/Makefile | 4 +-
...nject.c => of-reconfig-notifier-error-inject.c} | 22 +-
tools/perf/perf.h | 1 +
117 files changed, 1546 insertions(+), 839 deletions(-)
create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/raideng.txt
create mode 100644 arch/powerpc/boot/dts/a3m071.dts
create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi
delete mode 100644 arch/powerpc/include/asm/pSeries_reconfig.h
create mode 100644 arch/powerpc/include/asm/setup.h
rename arch/powerpc/kernel/{cpu_setup_power7.S => cpu_setup_power.S} (80%)
delete mode 100644 arch/powerpc/xmon/start.c
rename lib/{pSeries-reconfig-notifier-error-inject.c => of-reconfig-notifier-error-inject.c} (51%)
^ permalink raw reply
* [PATCH v3] NTP: Add a CONFIG_RTC_SYSTOHC configuration
From: Jason Gunthorpe @ 2012-12-17 21:30 UTC (permalink / raw)
To: John Stultz
Cc: Alessandro Zummo, rtc-linux, linux-kernel, Thomas Gleixner,
linuxppc-dev, linux-arm-kernel
In-Reply-To: <50CBB917.7090502@linaro.org>
The purpose of this option is to allow ARM/etc systems that rely on the
class RTC subsystem to have the same kind of automatic NTP based
synchronization that we have on PC platforms. Today ARM does not
implement update_persistent_clock and makes extensive use of the class
RTC system.
When enabled CONFIG_RTC_SYSTOHC will provide a generic
rtc_update_persistent_clock that stores the current time in the RTC and
is intended complement the existing CONFIG_RTC_HCTOSYS option that loads
the RTC at boot.
Like with RTC_HCTOSYS the platform's update_persistent_clock is used
first, if it works. Platforms with mixed class RTC and non-RTC drivers
need to return ENODEV when class RTC should be used. Such an update for
PPC is included in this patch.
Long term, implementations of update_persistent_clock should migrate to
proper class RTC drivers and use CONFIG_RTC_SYSTOHC instead.
Tested on ARM kirkwood and PPC405
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
---
arch/powerpc/kernel/time.c | 2 +-
drivers/rtc/Kconfig | 10 +++++++++-
drivers/rtc/Makefile | 1 +
drivers/rtc/systohc.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
include/linux/rtc.h | 1 +
kernel/time/ntp.c | 16 ++++++++++++----
6 files changed, 68 insertions(+), 6 deletions(-)
create mode 100644 drivers/rtc/systohc.c
v3 changes:
- Test menuconfig, reorder options to look better, fix kconfig
RTC_HCTOSYS_DEVICE to be 'or' not 'and'
- Change the function name to rtc_set_ntp_time to avoid confusing
this api with the distinct *_persistant_clock stuff
- Fix typo in the ENODEV test to be || not &&
- Fully retest on ARM+PPC
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index ce4cb77..bc844a8 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -667,7 +667,7 @@ int update_persistent_clock(struct timespec now)
struct rtc_time tm;
if (!ppc_md.set_rtc_time)
- return 0;
+ return -ENODEV;
to_tm(now.tv_sec + 1 + timezone_offset, &tm);
tm.tm_year -= 1900;
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 19c03ab..b377e96 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -25,9 +25,17 @@ config RTC_HCTOSYS
the value read from a specified RTC device. This is useful to avoid
unnecessary fsck runs at boot time, and to network better.
+config RTC_SYSTOHC
+ bool "Set the RTC time based on NTP synchronization"
+ default y
+ help
+ If you say yes here, the system time (wall clock) will be stored
+ in the RTC specified by RTC_HCTOSYS_DEVICE approximately every 11
+ minutes if userspace reports synchronized NTP status.
+
config RTC_HCTOSYS_DEVICE
string "RTC used to set the system time"
- depends on RTC_HCTOSYS = y
+ depends on RTC_HCTOSYS = y || RTC_SYSTOHC = y
default "rtc0"
help
The RTC device that will be used to (re)initialize the system
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 56297f0..69d11f1 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -6,6 +6,7 @@ ccflags-$(CONFIG_RTC_DEBUG) := -DDEBUG
obj-$(CONFIG_RTC_LIB) += rtc-lib.o
obj-$(CONFIG_RTC_HCTOSYS) += hctosys.o
+obj-$(CONFIG_RTC_SYSTOHC) += systohc.o
obj-$(CONFIG_RTC_CLASS) += rtc-core.o
rtc-core-y := class.o interface.o
diff --git a/drivers/rtc/systohc.c b/drivers/rtc/systohc.c
new file mode 100644
index 0000000..bf3e242
--- /dev/null
+++ b/drivers/rtc/systohc.c
@@ -0,0 +1,44 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ */
+#include <linux/rtc.h>
+#include <linux/time.h>
+
+/**
+ * rtc_set_ntp_time - Save NTP synchronized time to the RTC
+ * @now: Current time of day
+ *
+ * Replacement for the NTP platform function update_persistent_clock
+ * that stores time for later retrieval by rtc_hctosys.
+ *
+ * Returns 0 on successful RTC update, -ENODEV if a RTC update is not
+ * possible at all, and various other -errno for specific temporary failure
+ * cases.
+ *
+ * If temporary failure is indicated the caller should try again 'soon'
+ */
+int rtc_set_ntp_time(struct timespec now)
+{
+ struct rtc_device *rtc;
+ struct rtc_time tm;
+ int err = -ENODEV;
+
+ if (now.tv_nsec < (NSEC_PER_SEC >> 1))
+ rtc_time_to_tm(now.tv_sec, &tm);
+ else
+ rtc_time_to_tm(now.tv_sec + 1, &tm);
+
+ rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
+ if (rtc) {
+ /* rtc_hctosys exclusively uses UTC, so we call set_time here,
+ * not set_mmss. */
+ if (rtc->ops && (rtc->ops->set_time || rtc->ops->set_mmss))
+ err = rtc_set_time(rtc, &tm);
+ rtc_class_close(rtc);
+ }
+
+ return err;
+}
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 9531845..11d05f9 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -138,6 +138,7 @@ extern void rtc_device_unregister(struct rtc_device *rtc);
extern int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm);
extern int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm);
extern int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs);
+extern int rtc_set_ntp_time(struct timespec now);
int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm);
extern int rtc_read_alarm(struct rtc_device *rtc,
struct rtc_wkalrm *alrm);
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 24174b4..313b161 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -15,6 +15,7 @@
#include <linux/time.h>
#include <linux/mm.h>
#include <linux/module.h>
+#include <linux/rtc.h>
#include "tick-internal.h"
@@ -483,8 +484,7 @@ out:
return leap;
}
-#ifdef CONFIG_GENERIC_CMOS_UPDATE
-
+#if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC)
static void sync_cmos_clock(struct work_struct *work);
static DECLARE_DELAYED_WORK(sync_cmos_work, sync_cmos_clock);
@@ -510,14 +510,22 @@ static void sync_cmos_clock(struct work_struct *work)
}
getnstimeofday(&now);
- if (abs(now.tv_nsec - (NSEC_PER_SEC / 2)) <= tick_nsec / 2)
+ if (abs(now.tv_nsec - (NSEC_PER_SEC / 2)) <= tick_nsec / 2) {
+ fail = -ENODEV;
+#ifdef CONFIG_GENERIC_CMOS_UPDATE
fail = update_persistent_clock(now);
+#endif
+#ifdef CONFIG_RTC_SYSTOHC
+ if (fail == -ENODEV)
+ fail = rtc_set_ntp_time(now);
+#endif
+ }
next.tv_nsec = (NSEC_PER_SEC / 2) - now.tv_nsec - (TICK_NSEC / 2);
if (next.tv_nsec <= 0)
next.tv_nsec += NSEC_PER_SEC;
- if (!fail)
+ if (!fail || fail == -ENODEV)
next.tv_sec = 659;
else
next.tv_sec = 0;
--
1.7.5.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox