| Message ID | 1551288445-22335-3-git-send-email-thor.thayer@linux.intel.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | Update Stratix10 EDAC Bindings | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success |
On Wed, Feb 27, 2019 at 11:27:22AM -0600, thor.thayer@linux.intel.com wrote: > From: Thor Thayer <thor.thayer@linux.intel.com> > > Add peripheral bindings for Stratix10 EDAC to capture > the differences between the ARM64 and ARM32 architecture. What's the difference? Sounds like 2 different chips, so Stratix10 or s10 is not specific enough perhaps. > > Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com> > --- > v2 No change > --- > .../devicetree/bindings/edac/socfpga-eccmgr.txt | 106 +++++++++++++++++++++ > 1 file changed, 106 insertions(+) > > diff --git a/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt b/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt > index a0ac50e15912..a0fa80c53d2a 100644 > --- a/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt > +++ b/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt > @@ -258,6 +258,49 @@ Required Properties: > - compatible : Should be "altr,sdram-edac-s10" > - interrupts : Should be single bit error interrupt. > > +On-Chip RAM ECC > +Required Properties: > +- compatible : Should be "altr,socfpga-s10-ocram-ecc" > +- reg : Address and size for ECC block registers. > +- altr,ecc-parent : phandle to parent OCRAM node. > +- interrupts : Should be single bit error interrupt. > + > +Ethernet FIFO ECC > +Required Properties: > +- compatible : Should be "altr,socfpga-s10-eth-mac-ecc" > +- reg : Address and size for ECC block registers. > +- altr,ecc-parent : phandle to parent Ethernet node. > +- interrupts : Should be single bit error interrupt. > + > +NAND FIFO ECC > +Required Properties: > +- compatible : Should be "altr,socfpga-s10-nand-ecc" > +- reg : Address and size for ECC block registers. > +- altr,ecc-parent : phandle to parent NAND node. > +- interrupts : Should be single bit error interrupt. > + > +DMA FIFO ECC > +Required Properties: > +- compatible : Should be "altr,socfpga-s10-dma-ecc" > +- reg : Address and size for ECC block registers. > +- altr,ecc-parent : phandle to parent DMA node. > +- interrupts : Should be single bit error interrupt. > + > +USB FIFO ECC > +Required Properties: > +- compatible : Should be "altr,socfpga-s10-usb-ecc" > +- reg : Address and size for ECC block registers. > +- altr,ecc-parent : phandle to parent USB node. > +- interrupts : Should be single bit error interrupt. > + > +SDMMC FIFO ECC > +Required Properties: > +- compatible : Should be "altr,socfpga-s10-sdmmc-ecc" > +- reg : Address and size for ECC block registers. > +- altr,ecc-parent : phandle to parent SD/MMC node. > +- interrupts : Should be single bit error interrupt for port A > + and then single bit error interrupt for port B. > + > Example: > > eccmgr { > @@ -274,4 +317,67 @@ Example: > compatible = "altr,sdram-edac-s10"; > interrupts = <16 IRQ_TYPE_LEVEL_HIGH>; > }; > + > + ocram-ecc@ff8cc000 { > + compatible = "altr,socfpga-s10-ocram-ecc"; > + reg = <ff8cc000 0x100>; > + altr,ecc-parent = <&ocram>; > + interrupts = <1 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + emac0-rx-ecc@ff8c0000 { > + compatible = "altr,socfpga-s10-eth-mac-ecc"; > + reg = <0xff8c0000 0x100>; > + altr,ecc-parent = <&gmac0>; > + interrupts = <4 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + emac0-tx-ecc@ff8c0400 { > + compatible = "altr,socfpga-s10-eth-mac-ecc"; > + reg = <0xff8c0400 0x100>; > + altr,ecc-parent = <&gmac0>; > + interrupts = <5 IRQ_TYPE_LEVEL_HIGH>' > + }; > + > + nand-buf-ecc@ff8c8000 { > + compatible = "altr,socfpga-s10-nand-ecc"; > + reg = <0xff8c8000 0x100>; > + altr,ecc-parent = <&nand>; > + interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + nand-rd-ecc@ff8c8400 { > + compatible = "altr,socfpga-s10-nand-ecc"; > + reg = <0xff8c8400 0x100>; > + altr,ecc-parent = <&nand>; > + interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + nand-wr-ecc@ff8c8800 { > + compatible = "altr,socfpga-s10-nand-ecc"; > + reg = <0xff8c8800 0x100>; > + altr,ecc-parent = <&nand>; > + interrupts = <12 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + dma-ecc@ff8c9000 { > + compatible = "altr,socfpga-s10-dma-ecc"; > + reg = <0xff8c9000 0x100>; > + altr,ecc-parent = <&pdma>; > + interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; > + > + usb0-ecc@ff8c4000 { > + compatible = "altr,socfpga-s10-usb-ecc"; > + reg = <0xff8c4000 0x100>; > + altr,ecc-parent = <&usb0>; > + interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + sdmmc-ecc@ff8c8c00 { > + compatible = "altr,socfpga-s10-sdmmc-ecc"; > + reg = <0xff8c8c00 0x100>; > + altr,ecc-parent = <&mmc>; > + interrupts = <14 IRQ_TYPE_LEVEL_HIGH>, > + <15 IRQ_TYPE_LEVEL_HIGH>; > + }; > }; > -- > 2.7.4 >
Hi Rob, On 3/12/19 11:04 AM, Rob Herring wrote: > On Wed, Feb 27, 2019 at 11:27:22AM -0600, thor.thayer@linux.intel.com wrote: >> From: Thor Thayer <thor.thayer@linux.intel.com> >> >> Add peripheral bindings for Stratix10 EDAC to capture >> the differences between the ARM64 and ARM32 architecture. > > What's the difference? Sounds like 2 different chips, so Stratix10 or > s10 is not specific enough perhaps. > Yes, our ARM32 chips are the Cyclone5 and Arria10. The Stratix10 is ARM64 and I'm using S10 as shorthand for the Stratix10. The ECC blocks are very similar between Arria10 and Stratix10 but there are differences as a result of the ARM32 vs ARM64 architecture differences. The major difference is how Double Bit Errors are handled. In the ARM32, the DBE is mapped to an IRQ. On ARM64, the DBE is mapped to a SError. I had started out re-using the Arria10 bindings for Stratix10 since they were very similar. Dinh pointed out that having separate bindings for ARM64 would allow separation between the architectures and make future changes easier. I'm unclear on the comment about being specific enough. Are you suggesting that I use arm64 in the binding name instead of s10? Or is there a better naming convention I should follow? Thanks for your comments and for reviewing! Thor >> >> Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com> >> --- >> v2 No change >> --- >> .../devicetree/bindings/edac/socfpga-eccmgr.txt | 106 +++++++++++++++++++++ >> 1 file changed, 106 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt b/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt >> index a0ac50e15912..a0fa80c53d2a 100644 >> --- a/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt >> +++ b/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt >> @@ -258,6 +258,49 @@ Required Properties: >> - compatible : Should be "altr,sdram-edac-s10" >> - interrupts : Should be single bit error interrupt. >> >> +On-Chip RAM ECC >> +Required Properties: >> +- compatible : Should be "altr,socfpga-s10-ocram-ecc" >> +- reg : Address and size for ECC block registers. >> +- altr,ecc-parent : phandle to parent OCRAM node. >> +- interrupts : Should be single bit error interrupt. >> + >> +Ethernet FIFO ECC >> +Required Properties: >> +- compatible : Should be "altr,socfpga-s10-eth-mac-ecc" >> +- reg : Address and size for ECC block registers. >> +- altr,ecc-parent : phandle to parent Ethernet node. >> +- interrupts : Should be single bit error interrupt. >> + >> +NAND FIFO ECC >> +Required Properties: >> +- compatible : Should be "altr,socfpga-s10-nand-ecc" >> +- reg : Address and size for ECC block registers. >> +- altr,ecc-parent : phandle to parent NAND node. >> +- interrupts : Should be single bit error interrupt. >> + >> +DMA FIFO ECC >> +Required Properties: >> +- compatible : Should be "altr,socfpga-s10-dma-ecc" >> +- reg : Address and size for ECC block registers. >> +- altr,ecc-parent : phandle to parent DMA node. >> +- interrupts : Should be single bit error interrupt. >> + >> +USB FIFO ECC >> +Required Properties: >> +- compatible : Should be "altr,socfpga-s10-usb-ecc" >> +- reg : Address and size for ECC block registers. >> +- altr,ecc-parent : phandle to parent USB node. >> +- interrupts : Should be single bit error interrupt. >> + >> +SDMMC FIFO ECC >> +Required Properties: >> +- compatible : Should be "altr,socfpga-s10-sdmmc-ecc" >> +- reg : Address and size for ECC block registers. >> +- altr,ecc-parent : phandle to parent SD/MMC node. >> +- interrupts : Should be single bit error interrupt for port A >> + and then single bit error interrupt for port B. >> + >> Example: >> >> eccmgr { >> @@ -274,4 +317,67 @@ Example: >> compatible = "altr,sdram-edac-s10"; >> interrupts = <16 IRQ_TYPE_LEVEL_HIGH>; >> }; >> + >> + ocram-ecc@ff8cc000 { >> + compatible = "altr,socfpga-s10-ocram-ecc"; >> + reg = <ff8cc000 0x100>; >> + altr,ecc-parent = <&ocram>; >> + interrupts = <1 IRQ_TYPE_LEVEL_HIGH>; >> + }; >> + >> + emac0-rx-ecc@ff8c0000 { >> + compatible = "altr,socfpga-s10-eth-mac-ecc"; >> + reg = <0xff8c0000 0x100>; >> + altr,ecc-parent = <&gmac0>; >> + interrupts = <4 IRQ_TYPE_LEVEL_HIGH>; >> + }; >> + >> + emac0-tx-ecc@ff8c0400 { >> + compatible = "altr,socfpga-s10-eth-mac-ecc"; >> + reg = <0xff8c0400 0x100>; >> + altr,ecc-parent = <&gmac0>; >> + interrupts = <5 IRQ_TYPE_LEVEL_HIGH>' >> + }; >> + >> + nand-buf-ecc@ff8c8000 { >> + compatible = "altr,socfpga-s10-nand-ecc"; >> + reg = <0xff8c8000 0x100>; >> + altr,ecc-parent = <&nand>; >> + interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; >> + }; >> + >> + nand-rd-ecc@ff8c8400 { >> + compatible = "altr,socfpga-s10-nand-ecc"; >> + reg = <0xff8c8400 0x100>; >> + altr,ecc-parent = <&nand>; >> + interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; >> + }; >> + >> + nand-wr-ecc@ff8c8800 { >> + compatible = "altr,socfpga-s10-nand-ecc"; >> + reg = <0xff8c8800 0x100>; >> + altr,ecc-parent = <&nand>; >> + interrupts = <12 IRQ_TYPE_LEVEL_HIGH>; >> + }; >> + >> + dma-ecc@ff8c9000 { >> + compatible = "altr,socfpga-s10-dma-ecc"; >> + reg = <0xff8c9000 0x100>; >> + altr,ecc-parent = <&pdma>; >> + interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; >> + >> + usb0-ecc@ff8c4000 { >> + compatible = "altr,socfpga-s10-usb-ecc"; >> + reg = <0xff8c4000 0x100>; >> + altr,ecc-parent = <&usb0>; >> + interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; >> + }; >> + >> + sdmmc-ecc@ff8c8c00 { >> + compatible = "altr,socfpga-s10-sdmmc-ecc"; >> + reg = <0xff8c8c00 0x100>; >> + altr,ecc-parent = <&mmc>; >> + interrupts = <14 IRQ_TYPE_LEVEL_HIGH>, >> + <15 IRQ_TYPE_LEVEL_HIGH>; >> + }; >> }; >> -- >> 2.7.4 >> >
On Tue, Mar 12, 2019 at 2:28 PM Thor Thayer <thor.thayer@linux.intel.com> wrote: > > Hi Rob, > > On 3/12/19 11:04 AM, Rob Herring wrote: > > On Wed, Feb 27, 2019 at 11:27:22AM -0600, thor.thayer@linux.intel.com wrote: > >> From: Thor Thayer <thor.thayer@linux.intel.com> > >> > >> Add peripheral bindings for Stratix10 EDAC to capture > >> the differences between the ARM64 and ARM32 architecture. > > > > What's the difference? Sounds like 2 different chips, so Stratix10 or > > s10 is not specific enough perhaps. > > > > Yes, our ARM32 chips are the Cyclone5 and Arria10. The Stratix10 is > ARM64 and I'm using S10 as shorthand for the Stratix10. So it's really just differences between one chip and another... ARM32 vs 64 really has nothing to do with that. > > The ECC blocks are very similar between Arria10 and Stratix10 but there > are differences as a result of the ARM32 vs ARM64 architecture > differences. The major difference is how Double Bit Errors are handled. > In the ARM32, the DBE is mapped to an IRQ. On ARM64, the DBE is mapped > to a SError. Okay, I guess that's why arm64 matters... > I had started out re-using the Arria10 bindings for Stratix10 since they > were very similar. Dinh pointed out that having separate bindings for > ARM64 would allow separation between the architectures and make future > changes easier. > > I'm unclear on the comment about being specific enough. Are you > suggesting that I use arm64 in the binding name instead of s10? Or is > there a better naming convention I should follow? NM, it was me that was confused. It was that Stratix10 was already mentioned in the doc that confused me. Rob
Hi Rob, On 3/13/19 2:20 PM, Rob Herring wrote: > On Tue, Mar 12, 2019 at 2:28 PM Thor Thayer <thor.thayer@linux.intel.com> wrote: >> >> Hi Rob, >> >> On 3/12/19 11:04 AM, Rob Herring wrote: >>> On Wed, Feb 27, 2019 at 11:27:22AM -0600, thor.thayer@linux.intel.com wrote: >>>> From: Thor Thayer <thor.thayer@linux.intel.com> >>>> >>>> Add peripheral bindings for Stratix10 EDAC to capture >>>> the differences between the ARM64 and ARM32 architecture. >>> >>> What's the difference? Sounds like 2 different chips, so Stratix10 or >>> s10 is not specific enough perhaps. >>> >> >> Yes, our ARM32 chips are the Cyclone5 and Arria10. The Stratix10 is >> ARM64 and I'm using S10 as shorthand for the Stratix10. > > So it's really just differences between one chip and another... ARM32 > vs 64 really has nothing to do with that. > >> >> The ECC blocks are very similar between Arria10 and Stratix10 but there >> are differences as a result of the ARM32 vs ARM64 architecture >> differences. The major difference is how Double Bit Errors are handled. >> In the ARM32, the DBE is mapped to an IRQ. On ARM64, the DBE is mapped >> to a SError. > > Okay, I guess that's why arm64 matters... > >> I had started out re-using the Arria10 bindings for Stratix10 since they >> were very similar. Dinh pointed out that having separate bindings for >> ARM64 would allow separation between the architectures and make future >> changes easier. >> >> I'm unclear on the comment about being specific enough. Are you >> suggesting that I use arm64 in the binding name instead of s10? Or is >> there a better naming convention I should follow? > > NM, it was me that was confused. It was that Stratix10 was already > mentioned in the doc that confused me. > > Rob I can reword this to make it clearer. Do you have any additional suggestions for clarification aside from ARM64 vs ARM32 IRQ handling as we discuss above that you would need to ack this patch? Thanks, Thor
diff --git a/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt b/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt index a0ac50e15912..a0fa80c53d2a 100644 --- a/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt +++ b/Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt @@ -258,6 +258,49 @@ Required Properties: - compatible : Should be "altr,sdram-edac-s10" - interrupts : Should be single bit error interrupt. +On-Chip RAM ECC +Required Properties: +- compatible : Should be "altr,socfpga-s10-ocram-ecc" +- reg : Address and size for ECC block registers. +- altr,ecc-parent : phandle to parent OCRAM node. +- interrupts : Should be single bit error interrupt. + +Ethernet FIFO ECC +Required Properties: +- compatible : Should be "altr,socfpga-s10-eth-mac-ecc" +- reg : Address and size for ECC block registers. +- altr,ecc-parent : phandle to parent Ethernet node. +- interrupts : Should be single bit error interrupt. + +NAND FIFO ECC +Required Properties: +- compatible : Should be "altr,socfpga-s10-nand-ecc" +- reg : Address and size for ECC block registers. +- altr,ecc-parent : phandle to parent NAND node. +- interrupts : Should be single bit error interrupt. + +DMA FIFO ECC +Required Properties: +- compatible : Should be "altr,socfpga-s10-dma-ecc" +- reg : Address and size for ECC block registers. +- altr,ecc-parent : phandle to parent DMA node. +- interrupts : Should be single bit error interrupt. + +USB FIFO ECC +Required Properties: +- compatible : Should be "altr,socfpga-s10-usb-ecc" +- reg : Address and size for ECC block registers. +- altr,ecc-parent : phandle to parent USB node. +- interrupts : Should be single bit error interrupt. + +SDMMC FIFO ECC +Required Properties: +- compatible : Should be "altr,socfpga-s10-sdmmc-ecc" +- reg : Address and size for ECC block registers. +- altr,ecc-parent : phandle to parent SD/MMC node. +- interrupts : Should be single bit error interrupt for port A + and then single bit error interrupt for port B. + Example: eccmgr { @@ -274,4 +317,67 @@ Example: compatible = "altr,sdram-edac-s10"; interrupts = <16 IRQ_TYPE_LEVEL_HIGH>; }; + + ocram-ecc@ff8cc000 { + compatible = "altr,socfpga-s10-ocram-ecc"; + reg = <ff8cc000 0x100>; + altr,ecc-parent = <&ocram>; + interrupts = <1 IRQ_TYPE_LEVEL_HIGH>; + }; + + emac0-rx-ecc@ff8c0000 { + compatible = "altr,socfpga-s10-eth-mac-ecc"; + reg = <0xff8c0000 0x100>; + altr,ecc-parent = <&gmac0>; + interrupts = <4 IRQ_TYPE_LEVEL_HIGH>; + }; + + emac0-tx-ecc@ff8c0400 { + compatible = "altr,socfpga-s10-eth-mac-ecc"; + reg = <0xff8c0400 0x100>; + altr,ecc-parent = <&gmac0>; + interrupts = <5 IRQ_TYPE_LEVEL_HIGH>' + }; + + nand-buf-ecc@ff8c8000 { + compatible = "altr,socfpga-s10-nand-ecc"; + reg = <0xff8c8000 0x100>; + altr,ecc-parent = <&nand>; + interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; + }; + + nand-rd-ecc@ff8c8400 { + compatible = "altr,socfpga-s10-nand-ecc"; + reg = <0xff8c8400 0x100>; + altr,ecc-parent = <&nand>; + interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; + }; + + nand-wr-ecc@ff8c8800 { + compatible = "altr,socfpga-s10-nand-ecc"; + reg = <0xff8c8800 0x100>; + altr,ecc-parent = <&nand>; + interrupts = <12 IRQ_TYPE_LEVEL_HIGH>; + }; + + dma-ecc@ff8c9000 { + compatible = "altr,socfpga-s10-dma-ecc"; + reg = <0xff8c9000 0x100>; + altr,ecc-parent = <&pdma>; + interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; + + usb0-ecc@ff8c4000 { + compatible = "altr,socfpga-s10-usb-ecc"; + reg = <0xff8c4000 0x100>; + altr,ecc-parent = <&usb0>; + interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; + }; + + sdmmc-ecc@ff8c8c00 { + compatible = "altr,socfpga-s10-sdmmc-ecc"; + reg = <0xff8c8c00 0x100>; + altr,ecc-parent = <&mmc>; + interrupts = <14 IRQ_TYPE_LEVEL_HIGH>, + <15 IRQ_TYPE_LEVEL_HIGH>; + }; };