edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers
Subsystems (2)
PATCH v2 1/1 edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers
Simply add proper IDs into the device table.
---
It appears that the driver has two device ID tables. :-) So, my previous attempt enabled only half of the functionality.
Andrew,
Can you please replace
edac-mpc85xx-add-support-for-mpc8569-edac-controllers.patch
with this patch? It also adds some more IDs for the newer chips.
Thanks!
drivers/edac/mpc85xx_edac.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/edac/mpc85xx_edac.c +8 -0
@@ -646,8 +646,12 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { { .compatible = "fsl,mpc8555-l2-cache-controller", }, { .compatible = "fsl,mpc8560-l2-cache-controller", }, { .compatible = "fsl,mpc8568-l2-cache-controller", }, + { .compatible = "fsl,mpc8569-l2-cache-controller", }, { .compatible = "fsl,mpc8572-l2-cache-controller", }, + { .compatible = "fsl,p1020-l2-cache-controller", }, + { .compatible = "fsl,p1021-l2-cache-controller", }, { .compatible = "fsl,p2020-l2-cache-controller", }, + { .compatible = "fsl,p4080-l2-cache-controller", }, {}, };
@@ -1120,9 +1124,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { { .compatible = "fsl,mpc8555-memory-controller", }, { .compatible = "fsl,mpc8560-memory-controller", }, { .compatible = "fsl,mpc8568-memory-controller", }, + { .compatible = "fsl,mpc8569-memory-controller", }, { .compatible = "fsl,mpc8572-memory-controller", }, { .compatible = "fsl,mpc8349-memory-controller", }, + { .compatible = "fsl,p1020-memory-controller", }, + { .compatible = "fsl,p1021-memory-controller", }, { .compatible = "fsl,p2020-memory-controller", }, + { .compatible = "fsl,p4080-memory-controller", }, {}, };
Signature · 1 line
1.7.0.5
Quoted 26 lines · On Thu, 15 Jul 2010 22:25:07 +0400 Anton Vorontsov <[email protected]>…
Simply add proper IDs into the device table.
Signed-off-by Anton Vorontsov <[email protected]>---
It appears that the driver has two device ID tables. :-) So, my previous attempt enabled only half of the functionality.
Andrew,
Can you please replace
edac-mpc85xx-add-support-for-mpc8569-edac-controllers.patch
with this patch? It also adds some more IDs for the newer chips.
Thanks!
drivers/edac/mpc85xx_edac.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)drivers/edac/mpc85xx_edac.c +0
-0
drivers/edac/mpc85xx_edac.c static struct of_device_id mpc85xx_l2_err_of_match[] = { · line 654
Quoted 9 lines
drivers/edac/mpc85xx_edac.c +4
-0@@ -646,8 +646,12 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { { .compatible = "fsl,mpc8555-l2-cache-controller", }, { .compatible = "fsl,mpc8560-l2-cache-controller", }, { .compatible = "fsl,mpc8568-l2-cache-controller", }, + { .compatible = "fsl,mpc8569-l2-cache-controller", }, { .compatible = "fsl,mpc8572-l2-cache-controller", }, + { .compatible = "fsl,p1020-l2-cache-controller", }, + { .compatible = "fsl,p1021-l2-cache-controller", }, { .compatible = "fsl,p2020-l2-cache-controller", }, + { .compatible = "fsl,p4080-l2-cache-controller", },
L2 on the p4080 is quite different from those other chips. It's part of the core, controlled by SPRs.
-Scott
Quoted 11 lines · On Fri, 16 Jul 2010 15:12:24 -0500 Scott Wood <[email protected]> wrote:
Quoted 8 lines · On Thu, 15 Jul 2010 22:25:07 +0400 Anton Vorontsov <[email protected]>…
Simply add proper IDs into the device table.
Signed-off-by Anton Vorontsov <[email protected]>---
It appears that the driver has two device ID tables. :-) So, my previous attempt enabled only half of the functionality.
Quoted 8 lines
Quoted 8 lines
Andrew,
Can you please replace
edac-mpc85xx-add-support-for-mpc8569-edac-controllers.patch
with this patch? It also adds some more IDs for the newer chips.
edac-mpc85xx-add-support-for-mpc8569-edac-controllers.patch already got itself merged. I queued this:
drivers/edac/mpc85xx_edac.c renamed from drivers/edac/mpc85xx_edac.c~edac-mpc85xx-add-support-for-new-mpcxxx-pxxxx-edac-controllers +7 -0
@@ -646,8 +646,12 @@ static struct of_device_id mpc85xx_l2_er { .compatible = "fsl,mpc8555-l2-cache-controller", }, { .compatible = "fsl,mpc8560-l2-cache-controller", }, { .compatible = "fsl,mpc8568-l2-cache-controller", }, + { .compatible = "fsl,mpc8569-l2-cache-controller", }, { .compatible = "fsl,mpc8572-l2-cache-controller", }, + { .compatible = "fsl,p1020-l2-cache-controller", }, + { .compatible = "fsl,p1021-l2-cache-controller", }, { .compatible = "fsl,p2020-l2-cache-controller", }, + { .compatible = "fsl,p4080-l2-cache-controller", }, {}, };
@@ -1123,7 +1127,10 @@ static struct of_device_id mpc85xx_mc_er { .compatible = "fsl,mpc8569-memory-controller", }, { .compatible = "fsl,mpc8572-memory-controller", }, { .compatible = "fsl,mpc8349-memory-controller", }, + { .compatible = "fsl,p1020-memory-controller", }, + { .compatible = "fsl,p1021-memory-controller", }, { .compatible = "fsl,p2020-memory-controller", }, + { .compatible = "fsl,p4080-memory-controller", }, {}, };
_
Quoted 13 lines
Quoted 13 lines
drivers/edac/mpc85xx_edac.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)drivers/edac/mpc85xx_edac.c +1
-0@@ -646,8 +646,12 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { { .compatible = "fsl,mpc8555-l2-cache-controller", }, { .compatible = "fsl,mpc8560-l2-cache-controller", }, { .compatible = "fsl,mpc8568-l2-cache-controller", }, + { .compatible = "fsl,mpc8569-l2-cache-controller", },
Quoted 8 lines
drivers/edac/mpc85xx_edac.c static struct of_device_id mpc85xx_l2_err_of_match[] = { · line 654
Quoted 5 lines
drivers/edac/mpc85xx_edac.c +3
-0{ .compatible = "fsl,mpc8572-l2-cache-controller", }, + { .compatible = "fsl,p1020-l2-cache-controller", }, + { .compatible = "fsl,p1021-l2-cache-controller", }, { .compatible = "fsl,p2020-l2-cache-controller", }, + { .compatible = "fsl,p4080-l2-cache-controller", },L2 on the p4080 is quite different from those other chips. It's part of the core, controlled by SPRs.
erm, was that an ack or a nack?
Scott Wood
NAKQuoted 25 lines · On Wed, 21 Jul 2010 15:39:33 -0700 Andrew Morton <[email protected]>…
Quoted 13 lines · On Fri, 16 Jul 2010 15:12:24 -0500 Scott Wood <[email protected]> wrote:
Quoted 13 lines
drivers/edac/mpc85xx_edac.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)drivers/edac/mpc85xx_edac.c +1
-0@@ -646,8 +646,12 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { { .compatible = "fsl,mpc8555-l2-cache-controller", }, { .compatible = "fsl,mpc8560-l2-cache-controller", }, { .compatible = "fsl,mpc8568-l2-cache-controller", }, + { .compatible = "fsl,mpc8569-l2-cache-controller", },Quoted 8 lines
drivers/edac/mpc85xx_edac.c static struct of_device_id mpc85xx_l2_er · line 654
Quoted 5 lines
drivers/edac/mpc85xx_edac.c +3
-0{ .compatible = "fsl,mpc8572-l2-cache-controller", }, + { .compatible = "fsl,p1020-l2-cache-controller", }, + { .compatible = "fsl,p1021-l2-cache-controller", }, { .compatible = "fsl,p2020-l2-cache-controller", }, + { .compatible = "fsl,p4080-l2-cache-controller", },L2 on the p4080 is quite different from those other chips. It's part of the core, controlled by SPRs.
Quoted 1 line
erm, was that an ack or a nack?
NACK, p4080 doesn't belong in this table, at least not its L2.
L3 on p4080 is similar to L2 on these other chips, though, and it wouldn't take much to get this driver working on it -- but the match table entry should wait until the differences are accommodated.
-Scott
PATCH 1/1 edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers (fix)
On Wed, Jul 21, 2010 at 06:21:08PM -0500, Scott Wood wrote:
[...]
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ { .compatible = "fsl,p4080-l2-cache-controller", },L2 on the p4080 is quite different from those other chips. It's part of the core, controlled by SPRs.
Quoted 7 lines
Quoted 1 line
erm, was that an ack or a nack?
NACK, p4080 doesn't belong in this table, at least not its L2.
L3 on p4080 is similar to L2 on these other chips, though, and it wouldn't take much to get this driver working on it -- but the match table entry should wait until the differences are accommodated.
---
Scott, thanks for catching this!
Andrew, please merge this patch into edac-mpc85xx-add-support-for-new-mpcxxx-pxxxx-edac-controllers.patch
Thanks!
drivers/edac/mpc85xx_edac.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/edac/mpc85xx_edac.c +0 -1
@@ -652,7 +652,6 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { { .compatible = "fsl,p1020-l2-cache-controller", }, { .compatible = "fsl,p1021-l2-cache-controller", }, { .compatible = "fsl,p2020-l2-cache-controller", }, - { .compatible = "fsl,p4080-l2-cache-controller", }, {}, }; MODULE_DEVICE_TABLE(of, mpc85xx_l2_err_of_match);
Signature · 1 line
1.7.0.5
Re: [PATCH] edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers (fix)
Quoted 5 lines · Anton Vorontsov
On Wed, Jul 21, 2010 at 06:21:08PM -0500, Scott Wood wrote:
[...]Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ { .compatible =3D "fsl,p4080-l2-cache-controller", },=20
L2 on the p4080 is quite different from those other chips. It's =
part
drivers/edac/mpc85xx_edac.c static struct of_device_id =
Quoted 28 lines
Quoted 9 lines
Quoted 3 lines
Quoted 1 line
of the core, controlled by SPRs.
=20
erm, was that an ack or a nack?=20
NACK, p4080 doesn't belong in this table, at least not its L2. =20
L3 on p4080 is similar to L2 on these other chips, though, and it wouldn't take much to get this driver working on it -- but the match table entry should wait until the differences are accommodated.=20
Signed-off-by Anton Vorontsov <[email protected]>---
=20
Scott, thanks for catching this!
=20
Andrew, please merge this patch into edac-mpc85xx-add-support-for-new-mpcxxx-pxxxx-edac-controllers.patch =20
Thanks!
=20drivers/edac/mpc85xx_edac.c| 1 -1 files changed, 0 insertions(+), 1 deletions(-)=20
drivers/edac/mpc85xx_edac.c +0
-0@@ -652,7 +652,6 @@ static struct of_device_id =
mpc85xx_l2_err_of_match[] =3D {
Quoted 9 lines
drivers/edac/mpc85xx_edac.c +0
-2{ .compatible =3D "fsl,p1020-l2-cache-controller", }, { .compatible =3D "fsl,p1021-l2-cache-controller", }, { .compatible =3D "fsl,p2020-l2-cache-controller", }, - { .compatible =3D "fsl,p4080-l2-cache-controller", }, {}, }; MODULE_DEVICE_TABLE(of, mpc85xx_l2_err_of_match); --=201.7.0.5
Can you post a new patch as it doesn't look like this got merged by = Andrew so we need to clean up after ourselves.
- k
Re: [PATCH] edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers (fix)
On Thu, Oct 07, 2010 at 01:18:19AM -0500, Kumar Gala wrote:
[...]
Quoted 8 lines
Quoted 8 lines
drivers/edac/mpc85xx_edac.c +0
-0@@ -652,7 +652,6 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { { .compatible = "fsl,p1020-l2-cache-controller", }, { .compatible = "fsl,p1021-l2-cache-controller", }, { .compatible = "fsl,p2020-l2-cache-controller", },
Quoted 8 lines
Quoted 6 lines
drivers/edac/mpc85xx_edac.c +0
-1- { .compatible = "fsl,p4080-l2-cache-controller", }, {}, };MODULE_DEVICE_TABLE (of, mpc85xx_l2_err_of_match);Signature · 1 line
1.7.0.5Can you post a new patch as it doesn't look like this got merged by Andrew so we need to clean up after ourselves.
It's already in Linus' tree.
Thanks,
- - - -
commit cd1542c8197fc3c2eb3a8301505d5d9738fab1e4
Author: Anton Vorontsov <[email protected]> Date: Tue Aug 10 18:03:21 2010 -0700
edac: mpc85xx: add support for new MPCxxx/Pxxxx EDAC controllers
Simply add proper IDs into the device table.
drivers/edac/mpc85xx_edac.c +6 -0
@@ -647,7 +647,10 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = { { .compatible = "fsl,mpc8555-l2-cache-controller", }, { .compatible = "fsl,mpc8560-l2-cache-controller", }, { .compatible = "fsl,mpc8568-l2-cache-controller", }, + { .compatible = "fsl,mpc8569-l2-cache-controller", }, { .compatible = "fsl,mpc8572-l2-cache-controller", }, + { .compatible = "fsl,p1020-l2-cache-controller", }, + { .compatible = "fsl,p1021-l2-cache-controller", }, { .compatible = "fsl,p2020-l2-cache-controller", }, {}, };
@@ -1125,7 +1128,10 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { { .compatible = "fsl,mpc8569-memory-controller", }, { .compatible = "fsl,mpc8572-memory-controller", }, { .compatible = "fsl,mpc8349-memory-controller", }, + { .compatible = "fsl,p1020-memory-controller", }, + { .compatible = "fsl,p1021-memory-controller", }, { .compatible = "fsl,p2020-memory-controller", }, + { .compatible = "fsl,p4080-memory-controller", }, {}, }; MODULE_DEVICE_TABLE(of, mpc85xx_mc_err_of_match);
Re: [PATCH] edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers (fix)
Quoted 2 lines
=20
It's already in Linus' tree.
Yeah, the problem is what's merged in linus's tree has p4080 listed and = it shouldn't
drivers/edac/mpc85xx_edac.c static struct of_device_id =
Quoted 25 lines
=20
Thanks,
=20
- - - -
commitcd1542c8197fc3c2eb3a8301505d5d9738fab1e4Author: Anton Vorontsov <[email protected]> Date: Tue Aug 10 18:03:21 2010 -0700=20
edac: mpc85xx: add support for new MPCxxx/Pxxxx EDAC controllers
=20
Simply add proper IDs into the device table.
=20Signed-off-by Anton Vorontsov <[email protected]>Cc Scott Wood <[email protected]>Cc Peter Tyser <[email protected]>Cc Dave Jiang <[email protected]>Cc Doug Thompson <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>=20
drivers/edac/mpc85xx_edac.c +0
-0@@ -647,7 +647,10 @@ static struct of_device_id =
mpc85xx_l2_err_of_match[] =3D {
drivers/edac/mpc85xx_edac.c static struct of_device_id =
Quoted 11 lines
drivers/edac/mpc85xx_edac.c +3
-0{ .compatible =3D "fsl,mpc8555-l2-cache-controller", }, { .compatible =3D "fsl,mpc8560-l2-cache-controller", }, { .compatible =3D "fsl,mpc8568-l2-cache-controller", }, + { .compatible =3D "fsl,mpc8569-l2-cache-controller", }, { .compatible =3D "fsl,mpc8572-l2-cache-controller", }, + { .compatible =3D "fsl,p1020-l2-cache-controller", }, + { .compatible =3D "fsl,p1021-l2-cache-controller", }, { .compatible =3D "fsl,p2020-l2-cache-controller", }, {}, };@@ -1125,7 +1128,10 @@ static struct of_device_id =
mpc85xx_mc_err_of_match[] =3D {
drivers/edac/mpc85xx_edac.c static struct of_device_id = · line 1134
Quoted 7 lines
drivers/edac/mpc85xx_edac.c +3
-0{ .compatible =3D "fsl,mpc8569-memory-controller", }, { .compatible =3D "fsl,mpc8572-memory-controller", }, { .compatible =3D "fsl,mpc8349-memory-controller", }, + { .compatible =3D "fsl,p1020-memory-controller", }, + { .compatible =3D "fsl,p1021-memory-controller", }, { .compatible =3D "fsl,p2020-memory-controller", }, + { .compatible =3D "fsl,p4080-memory-controller", },
This line should be here ;)
Quoted 3 lines
drivers/edac/mpc85xx_edac.c +0
-0{}, };MODULE_DEVICE_TABLE (of, mpc85xx_mc_err_of_match);
Re: [PATCH] edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers (fix)
Quoted 1 line · Kumar Gala
Quoted 1 line
@ -1125,7 +1128,10 @@ static struct
of_device_id=
mpc85xx_mc_err_of_match[] =3D {
Quoted 9 lines
Review
Quoted 7 lines
{ .compatible =3D "fsl,mpc8569-memory-controller", }, { .compatible =3D "fsl,mpc8572-memory-controller", }, { .compatible =3D "fsl,mpc8349-memory-controller", },(quoted diff) +2
-0+ { .compatible =3D "fsl,p1020-memory-controller", }, + { .compatible =3D "fsl,p1021-memory-controller", },{ .compatible =3D "fsl,p2020-memory-controller", },(quoted diff) +1
-0+ { .compatible =3D "fsl,p4080-memory-controller", },=20
This line should be here ;)
should NOT be here.
- k=
Re: [PATCH] edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers (fix)
Quoted 14 lines · Kumar Gala
Quoted 10 lines · Kumar Gala
drivers/edac/mpc85xx_edac.c static struct of_device_id mpc85xx_mc_err_of_match[] = { · line 1134
Quoted 8 lines
@ -1125,7 +1128,10 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { { .compatible = "fsl,mpc8569-memory-controller", }, { .compatible = "fsl,mpc8572-memory-controller", }, { .compatible = "fsl,mpc8349-memory-controller", },drivers/edac/mpc85xx_edac.c +2
-0+ { .compatible = "fsl,p1020-memory-controller", }, + { .compatible = "fsl,p1021-memory-controller", },{ .compatible = "fsl,p2020-memory-controller", },drivers/edac/mpc85xx_edac.c +1
-0+ { .compatible = "fsl,p4080-memory-controller", },This line should be here ;)
Quoted 1 line
should NOT be here.
Hm. Are you sure? I thought that only L2 cache controller is not applicable (and based on Scott's comment I removed the l2 cache compatible entry for p4080). But I guess memory-controller is somewhat similar to all other 85xx?
If it's not, I can surely prepare a patch that removes p4080 entry.
Thanks,
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
Re: [PATCH] edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers (fix)
Quoted 5 lines · Anton Vorontsov
Quoted 4 lines · Kumar Gala
=20
On Oct 7, 2010, at 1:37 AM, Kumar Gala wrote:
=20Quoted 1 line
Quoted 1 line
@ -1125,7 +1128,10 @@ static struct
of_device_id=
mpc85xx_mc_err_of_match[] =3D {
Quoted 11 lines
Quoted 11 lines
Quoted 9 lines
Review
Quoted 7 lines
{ .compatible =3D "fsl,mpc8569-memory-controller", }, { .compatible =3D "fsl,mpc8572-memory-controller", }, { .compatible =3D "fsl,mpc8349-memory-controller", },(quoted diff) +2
-0+ { .compatible =3D "fsl,p1020-memory-controller", }, + { .compatible =3D "fsl,p1021-memory-controller", },{ .compatible =3D "fsl,p2020-memory-controller", },(quoted diff) +1
-0+ { .compatible =3D "fsl,p4080-memory-controller", },=20
This line should be here ;)=20
should NOT be here.
Quoted 10 lines
=20
Hm. Are you sure? I thought that only L2 cache controller is not applicable (and based on Scott's comment I removed the l2 cache compatible entry for p4080). But I guess memory-controller is somewhat similar to all other 85xx? =20
If it's not, I can surely prepare a patch that removes p4080 entry.
=20
Thanks,
Your correct, late night and looking at the wrong line. It was the L2 = that should have been removed. Ignore me.
- k=