mpc85xx_edac changes for 3.13
Subsystems (2)
Hi Linus,
Please pull these changes for mpc85xx_edac. They have been around on linux-edac for a while.
Thanks.
--
The following changes since commit 10d0c9705e80bbd3d587c5fad24599aabaca6688:
Merge tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux (2013-11-12 16:52:17 +0900)
are available in the git repository at:
git://github.com/morbidrsa/linux.git tags/mpc85xx-edac-for-3.13
for you to fetch changes up to 43b5acb650587ec6495c2e3b8c2e30311e9dc8cf:
edac/85xx: Remove mpc85xx_pci_err_remove (2013-11-12 17:06:16 +0100)
----------------------------------------------------------------mpc85xx_edac for 3.13
----------------------------------------------------------------
Chunhe Lan (1):
edac/85xx: Add PCIe error interrupt edac support
Johannes Thumshirn (2):
MAINTAINERS: Add edac-mpc85xx driver to MAINTAINERS edac/85xx: Remove mpc85xx_pci_err_remove
MAINTAINERS | 7 +++ drivers/edac/mpc85xx_edac.c | 120 ++++++++++++++++++++++++++++++++------------ drivers/edac/mpc85xx_edac.h | 7 +++ 3 files changed, 101 insertions(+), 33 deletions(-)
MAINTAINERS +7 -0
@@ -3129,6 +3129,13 @@ W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i82975x_edac.c +EDAC-MPC85XX +M: Johannes Thumshirn <[email protected]> +L: [email protected] +W: bluesmoke.sourceforge.net +S: Maintained +F: drivers/edac/mpc85xx_edac.[ch] + EDAC-PASEMI M: Egor Martovetsky <[email protected]> L: [email protected]
drivers/edac/mpc85xx_edac.c +87 -33
177 lines not on this page · raw message
drivers/edac/mpc85xx_edac.h +7 -0
@@ -134,13 +134,19 @@#define MPC85XX_PCI_ERR_DR 0x0000#define MPC85XX_PCI_ERR_CAP_DR 0x0004#define MPC85XX_PCI_ERR_EN 0x0008 +#define PEX_ERR_ICCAIE_EN_BIT 0x00020000#define MPC85XX_PCI_ERR_ATTRIB 0x000c#define MPC85XX_PCI_ERR_ADDR 0x0010 +#define PEX_ERR_ICCAD_DISR_BIT 0x00020000#define MPC85XX_PCI_ERR_EXT_ADDR 0x0014#define MPC85XX_PCI_ERR_DL 0x0018#define MPC85XX_PCI_ERR_DH 0x001c#define MPC85XX_PCI_GAS_TIMR 0x0020#define MPC85XX_PCI_PCIX_TIMR 0x0024 +#define MPC85XX_PCIE_ERR_CAP_R0 0x0028 +#define MPC85XX_PCIE_ERR_CAP_R1 0x002c +#define MPC85XX_PCIE_ERR_CAP_R2 0x0030 +#define MPC85XX_PCIE_ERR_CAP_R3 0x0034struct mpc85xx_mc_pdata {char *name;
@@ -158,6 +164,7 @@ struct mpc85xx_l2_pdata {struct mpc85xx_pci_pdata {char *name; +bool is_pcie;int edac_idx;void __iomem *pci_vbase;int irq;
Quoted 2 lines · Johannes Thumshirn
git://github.com/morbidrsa/linux.gittags/mpc85xx-edac-for-3.13
Ok, it's a signed tag, but I haven't pulled from you before (all the commits I see seem to have gone through Greg), and I don't recognize any of the signatures on your tag.
That, together with not really knowing the whole edac area, makes me not wonderfully happy about pulling directly. I a.lso see another edac pull request in my mailbox, making me suspect that there are maintainership problems (historically I've been getting the code either though Greg, Borislav or Mauro). So I'd also like to make sure that I at least _know_ about any disputes going on in this area?
So before I pull this, I'd quickly like to validate the gpg key, and am cc'ing more people to see if I'm stepping into some political nightmare. I can be ok with that, but I want to do so knowingly, not blindly..
Linus
Quoted 16 lines · Linus Torvalds
Quoted 2 lines · Johannes Thumshirn
git://github.com/morbidrsa/linux.gittags/mpc85xx-edac-for-3.13Ok, it's a signed tag, but I haven't pulled from you before (all the commits I see seem to have gone through Greg), and I don't recognize any of the signatures on your tag.
That, together with not really knowing the whole edac area, makes me not wonderfully happy about pulling directly. I a.lso see another edac pull request in my mailbox, making me suspect that there are maintainership problems (historically I've been getting the code either though Greg, Borislav or Mauro). So I'd also like to make sure that I at least _know_ about any disputes going on in this area?
Quoted 4 lines
So before I pull this, I'd quickly like to validate the gpg key, and am cc'ing more people to see if I'm stepping into some political nightmare. I can be ok with that, but I want to do so knowingly, not blindly..
I thought Doug was the maintainer of EDAC (now added to the to:), and Mauro has been doing a bunch of work there, while he was at Red Hat. I haven't taken any EDAC patches in a while since Mauro started cleaning up the area, so I don't know anything about this, sorry.
Doug?
Quoted 22 lines · Greg Kroah-Hartman
Quoted 16 lines · Linus Torvalds
Quoted 2 lines · Johannes Thumshirn
git://github.com/morbidrsa/linux.gittags/mpc85xx-edac-for-3.13Ok, it's a signed tag, but I haven't pulled from you before (all the commits I see seem to have gone through Greg), and I don't recognize any of the signatures on your tag.
That, together with not really knowing the whole edac area, makes me not wonderfully happy about pulling directly. I a.lso see another edac pull request in my mailbox, making me suspect that there are maintainership problems (historically I've been getting the code either though Greg, Borislav or Mauro). So I'd also like to make sure that I at least _know_ about any disputes going on in this area?
Quoted 4 lines
So before I pull this, I'd quickly like to validate the gpg key, and am cc'ing more people to see if I'm stepping into some political nightmare. I can be ok with that, but I want to do so knowingly, not blindly..
Quoted 4 lines
I thought Doug was the maintainer of EDAC (now added to the to:), and Mauro has been doing a bunch of work there, while he was at Red Hat. I haven't taken any EDAC patches in a while since Mauro started cleaning up the area, so I don't know anything about this, sorry.
Ok, let me try to explain the deal as I see it:
The original EDAC maintainer was/is Doug. I say is, because he told me recently, he wants to get involved and collect stuff again.
Now, what we have been doing so far in the interim couple of years while Doug was away is both Mauro and me have been sending the patches for those EDAC drivers each of us maintains directly to Linus. I have also been trying to collect stuff for other EDAC drivers and I know Mauro has been doing that too, but, at least in my case, I was paying attention *not* to step into the role of maintainer for the whole EDAC subsystem.
Here are my reasons why: Those drivers are for all kinds of arches for which I certainly don't have the hardware to test patches on, and, in some cases, even the people who wrote them disappear/go do something else and thus it is really hard to get someone with the hardware to atleast test the patch before I collect it.
So what I told Robert Richter (he sent you the pull request for Calxeda Highbank) and Johannes Thumshirn (who volunteered to maintain mpc85xx_edac.* because he has the hardware and needs it for work) was to send pull requests straight to Linus.
In Robert's case, you have him in the chain of trust from previous work and since he works for Calxeda now, you basically have the vendor maintaining its own driver.
Johannes I told that he needs to get his key signed by a couple of kernel devs but he hasn't had the time to go meet them and do that yet.
I know what you're gonna say now, you probably would like to pull from only 1 or 2 EDAC maintainers tops and not from every driver maintainer.
I guess we can work with this temporary solution until Doug takes over or, if he doesn't, come up with one maintainer who simply funnels stuff to you. For example, I could do that but only with the drivers where I have people with the hardware who can test and fix bugs - I don't want any half-baked patches which fix hearsay bugs or brown-paper bags. I certainly don't have the volume to review more involved patches for other drivers so if we do this, I'll have to have people who ack them and fix them when there's trouble.
You let me know what you would prefer and we will work something out.
Thanks!
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Em Thu, 14 Nov 2013 10:20:10 +0100
Borislav Petkov <[email protected]> escreveu:
Quoted 70 lines · Greg Kroah-Hartman
Quoted 22 lines · Linus Torvalds
Quoted 16 lines
Quoted 2 lines · Johannes Thumshirn
git://github.com/morbidrsa/linux.gittags/mpc85xx-edac-for-3.13Ok, it's a signed tag, but I haven't pulled from you before (all the commits I see seem to have gone through Greg), and I don't recognize any of the signatures on your tag.
That, together with not really knowing the whole edac area, makes me not wonderfully happy about pulling directly. I a.lso see another edac pull request in my mailbox, making me suspect that there are maintainership problems (historically I've been getting the code either though Greg, Borislav or Mauro). So I'd also like to make sure that I at least _know_ about any disputes going on in this area?
Quoted 4 lines
So before I pull this, I'd quickly like to validate the gpg key, and am cc'ing more people to see if I'm stepping into some political nightmare. I can be ok with that, but I want to do so knowingly, not blindly..
Quoted 4 lines
I thought Doug was the maintainer of EDAC (now added to the to:), and Mauro has been doing a bunch of work there, while he was at Red Hat. I haven't taken any EDAC patches in a while since Mauro started cleaning up the area, so I don't know anything about this, sorry.
Ok, let me try to explain the deal as I see it:
The original EDAC maintainer was/is Doug. I say is, because he told me recently, he wants to get involved and collect stuff again.
Now, what we have been doing so far in the interim couple of years while Doug was away is both Mauro and me have been sending the patches for those EDAC drivers each of us maintains directly to Linus. I have also been trying to collect stuff for other EDAC drivers and I know Mauro has been doing that too, but, at least in my case, I was paying attention *not* to step into the role of maintainer for the whole EDAC subsystem.
Here are my reasons why: Those drivers are for all kinds of arches for which I certainly don't have the hardware to test patches on, and, in some cases, even the people who wrote them disappear/go do something else and thus it is really hard to get someone with the hardware to atleast test the patch before I collect it.
So what I told Robert Richter (he sent you the pull request for Calxeda Highbank) and Johannes Thumshirn (who volunteered to maintain mpc85xx_edac.* because he has the hardware and needs it for work) was to send pull requests straight to Linus.
In Robert's case, you have him in the chain of trust from previous work and since he works for Calxeda now, you basically have the vendor maintaining its own driver.
Johannes I told that he needs to get his key signed by a couple of kernel devs but he hasn't had the time to go meet them and do that yet.
I know what you're gonna say now, you probably would like to pull from only 1 or 2 EDAC maintainers tops and not from every driver maintainer.
I guess we can work with this temporary solution until Doug takes over or, if he doesn't, come up with one maintainer who simply funnels stuff to you. For example, I could do that but only with the drivers where I have people with the hardware who can test and fix bugs - I don't want any half-baked patches which fix hearsay bugs or brown-paper bags. I certainly don't have the volume to review more involved patches for other drivers so if we do this, I'll have to have people who ack them and fix them when there's trouble.
Quoted 1 line
You let me know what you would prefer and we will work something out.
As Boris said, the official maintainer is Doug, but he is not being active over the last couple years or so.
As I was actively writing new EDAC drivers and needed to rewrite the core part of the subsystem, in order for it to properly work with Intel modern memory controllers/CPUs, I was submitting the patches to you directly. In the beginning, I was waiting for Doug's ack before doing that. After he stopped answering emails, I kept him c/c for at least a couple Kernel versions. After that, I started to just c/c the Mailing lists.
I also took the care to not step on Boris, with actively maintains the amd64_edac driver. So, I only applied on my tree patches from the AMD64 EDAC driver with his ack.
So, in practice, Borislav was working as a maintainer for amd64 EDAC patches, and I working mainly as Intel EDAC maintainer. The (few) other arm EDAC patches were either coming via my tree or via Boris tree, depending on who got them first.
That's said, while working at Red Hat, I had access to a large number of different hardware. So, I was capable of testing the changes on most x86 hardware supported. I also wrote some testing procedures while there, in order to use Red Hat lab to test EDAC on all hardware that supports EDAC we found there. Several bugs were corrected on those drivers due to that.
Nowadays, I'm still actively maintaining an userspace counterpart of the EDAC subsystem[1], but I have access to just one hardware (a Sandy Bridge Xeon machine). Currently, I'm not working on any new EDAC driver, although I expect to have some new EDAC projects for the next year.
[1] https://git.fedorahosted.org/git/rasdaemon.git
Also, Aristeu asked me this week to merge some Ivy Bridge EDAC patches he submitted in the past to the EDAC ML on my tree and forward them to you.
So, if you want, I can review the pending EDAC patches, apply them on my tree and sending you a pull request, working as a maintainer, while we don't have some full time maintainer for it.
Regards,
Mauro
Borislav Petkov
maintainerQuoted 4 lines · Mauro Carvalho Chehab
So, in practice, Borislav was working as a maintainer for amd64 EDAC patches, and I working mainly as Intel EDAC maintainer. The (few) other arm EDAC patches were either coming via my tree or via Boris tree, depending on who got them first.
Yeah, and I think this has worked pretty good in the past so if you want to, we can continue the same thing of sharing the load on EDAC patches and we both do interim maintainers until Doug steps in.
And since it won't change any workflow for Linus, he's probably fine with it too.
Yes, no? Comments?
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Quoted 6 lines · Borislav Petkov
Quoted 4 lines · Mauro Carvalho Chehab
So, in practice, Borislav was working as a maintainer for amd64 EDAC patches, and I working mainly as Intel EDAC maintainer. The (few) other arm EDAC patches were either coming via my tree or via Boris tree, depending on who got them first.
Quoted 8 lines
Yeah, and I think this has worked pretty good in the past so if you want to, we can continue the same thing of sharing the load on EDAC patches and we both do interim maintainers until Doug steps in.
And since it won't change any workflow for Linus, he's probably fine with it too.
Yes, no? Comments?
There will be some upcomming arm/arm64 specific changes which might effect also the core driver in the future. I would be willing to collect and send these ones upstream in coordination with you.
Thanks,
-Robert
Quoted 6 lines · Borislav Petkov
Quoted 4 lines · Mauro Carvalho Chehab
So, in practice, Borislav was working as a maintainer for amd64 EDAC patches, and I working mainly as Intel EDAC maintainer. The (few) other arm EDAC patches were either coming via my tree or via Boris tree, depending on who got them first.
Quoted 8 lines
Yeah, and I think this has worked pretty good in the past so if you want to, we can continue the same thing of sharing the load on EDAC patches and we both do interim maintainers until Doug steps in.
And since it won't change any workflow for Linus, he's probably fine with it too.
Yes, no? Comments?
OK for me. For the MPC85xx EDAC I'll do the testing then and either Borislav or Mauro send them upstream.
Regards,
Johannes
Em Thu, 14 Nov 2013 15:21:25 +0100
Johannes Thumshirn <[email protected]> escreveu:
Quoted 8 lines · Borislav Petkov
Quoted 7 lines · Mauro Carvalho Chehab
Quoted 4 lines
So, in practice, Borislav was working as a maintainer for amd64 EDAC patches, and I working mainly as Intel EDAC maintainer. The (few) other arm EDAC patches were either coming via my tree or via Boris tree, depending on who got them first.
Yeah, and I think this has worked pretty good in the past
Fully agreed.
Quoted 3 lines
Quoted 3 lines
so if you want
to, we can continue the same thing of sharing the load on EDAC patches and we both do interim maintainers until Doug steps in.
Works for me.
Quoted 8 lines
Quoted 5 lines
And since it won't change any workflow for Linus, he's probably fine with it too.
Yes, no? Comments?
OK for me. For the MPC85xx EDAC I'll do the testing then and either Borislav or Mauro send them upstream.
Ok.
Regards,
Mauro
Borislav Petkov
maintainerQuoted 2 lines · Johannes Thumshirn
OK for me. For the MPC85xx EDAC I'll do the testing then and either Borislav or Mauro send them upstream.
Btw, would you send the patches to the list so that I can pick them up?
Thanks.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--