From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4/8] ARM: l2x0: add arm,ecc-enable property for aurora From: Gregory CLEMENT Message-Id: <87fuedvfm7.fsf@free-electrons.com> Date: Mon, 03 Jul 2017 15:01:36 +0200 To: Jan Luebbe Cc: Chris Packham , linux-arm-kernel@lists.infradead.org, linux-edac@vger.kernel.org, kernel@pengutronix.de, Thomas Petazzoni List-ID: SGkgSmFuLAogCiBPbiB2ZW4uLCBqdWluIDMwIDIwMTcsIEphbiBMdWViYmUgPGpsdUBwZW5ndXRy b25peC5kZT4gd3JvdGU6Cgo+IEZyb206IENocmlzIFBhY2toYW0gPGNocmlzLnBhY2toYW1AYWxs aWVkdGVsZXNpcy5jby5uej4KPgo+IFRoZSBhdXJvcmEgY2FjaGUgb24gdGhlIE1hcnZlbGwgQXJt YWRhLVhQIFNvQyBzdXBwb3J0cyBFQ0MgcHJvdGVjdGlvbgo+IGZvciB0aGUgTDIgZGF0YSBhcnJh eXMuIEFkZCBhICJhcm0sZWNjLWVuYWJsZSIgZGV2aWNlIHRyZWUgcHJvcGVydHkKPiB3aGljaCBj YW4gYmUgdXNlZCB0byBlbmFibGUgdGhpcy4KPgo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFBhY2to YW0gPGNocmlzLnBhY2toYW1AYWxsaWVkdGVsZXNpcy5jby5uej4KPiBbamx1QHBlbmd1dHJvbml4 LmRlOiB1c2UgYXVyb3JhIHNwZWNpZmljIGRlZmluZSBBVVJPUkFfQUNSX0VDQ19FTl0KPiBTaWdu ZWQtb2ZmLWJ5OiBKYW4gTHVlYmJlIDxqbHVAcGVuZ3V0cm9uaXguZGU+Cj4gLS0tCj4gIERvY3Vt ZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9hcm0vbDJjMngwLnR4dCB8IDIgKysKPiAgYXJj aC9hcm0vbW0vY2FjaGUtbDJ4MC5jICAgICAgICAgICAgICAgICAgICAgICAgIHwgNyArKysrKysr Cj4gIDIgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspCj4KPiBkaWZmIC0tZ2l0IGEvRG9j dW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL2FybS9sMmMyeDAudHh0IGIvRG9jdW1lbnRh dGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL2FybS9sMmMyeDAudHh0Cj4gaW5kZXggZDk2NTBjMTc4 OGY0Li42MzE2ZTY3MzMwN2EgMTAwNjQ0Cj4gLS0tIGEvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVl L2JpbmRpbmdzL2FybS9sMmMyeDAudHh0Cj4gKysrIGIvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVl L2JpbmRpbmdzL2FybS9sMmMyeDAudHh0Cj4gQEAgLTc2LDYgKzc2LDggQEAgT3B0aW9uYWwgcHJv cGVydGllczoKPiAgICBzcGVjaWZpZWQgdG8gaW5kaWNhdGUgdGhhdCBzdWNoIHRyYW5zZm9ybXMg YXJlIHByZWNsdWRlZC4KPiAgLSBhcm0scGFyaXR5LWVuYWJsZSA6IGVuYWJsZSBwYXJpdHkgY2hl Y2tpbmcgb24gdGhlIEwyIGNhY2hlIChMMjIwIG9yIFBMMzEwKS4KPiAgLSBhcm0scGFyaXR5LWRp c2FibGUgOiBkaXNhYmxlIHBhcml0eSBjaGVja2luZyBvbiB0aGUgTDIgY2FjaGUgKEwyMjAgb3Ig UEwzMTApLgo+ICstIGFybSxlY2MtZW5hYmxlIDogZW5hYmxlIEVDQyBwcm90ZWN0aW9uIG9uIHRo ZSBMMiBjYWNoZQo+ICstIGFybSxlY2MtZGlzYWJsZSA6IGRpc2FibGUgRUNDIHByb3RlY3Rpb24g b24gdGhlIEwyIGNhY2hlCj4gIC0gYXJtLG91dGVyLXN5bmMtZGlzYWJsZSA6IGRpc2FibGUgdGhl IG91dGVyIHN5bmMgb3BlcmF0aW9uIG9uIHRoZSBMMiBjYWNoZS4KPiAgICBTb21lIGNvcmUgdGls ZXMsIGVzcGVjaWFsbHkgQVJNIFBCMTFNUENvcmUgaGF2ZSBhIGZhdWx0eSBMMjIwIGNhY2hlIHRo YXQKPiAgICB3aWxsIHJhbmRvbWx5IGhhbmcgdW5sZXNzIG91dGVyIHN5bmMgb3BlcmF0aW9ucyBh cmUgZGlzYWJsZWQuCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21tL2NhY2hlLWwyeDAuYyBiL2Fy Y2gvYXJtL21tL2NhY2hlLWwyeDAuYwo+IGluZGV4IGI3MGJlZTc0NzUwZC4uZWEyYTNkY2M3NWE5 IDEwMDY0NAo+IC0tLSBhL2FyY2gvYXJtL21tL2NhY2hlLWwyeDAuYwo+ICsrKyBiL2FyY2gvYXJt L21tL2NhY2hlLWwyeDAuYwo+IEBAIC0xNTA1LDYgKzE1MDUsMTMgQEAgc3RhdGljIHZvaWQgX19p bml0IGF1cm9yYV9vZl9wYXJzZShjb25zdCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wLAo+ICAJCW1h c2sgfD0gQVVST1JBX0FDUl9GT1JDRV9XUklURV9QT0xJQ1lfTUFTSzsKPiAgCX0KPiAgCj4gKwlp ZiAob2ZfcHJvcGVydHlfcmVhZF9ib29sKG5wLCAiYXJtLGVjYy1lbmFibGUiKSkgewo+ICsJCW1h c2sgfD0gQVVST1JBX0FDUl9FQ0NfRU47Cj4gKwkJdmFsIHw9IEFVUk9SQV9BQ1JfRUNDX0VOOwo+ ICsJfSBlbHNlIGlmIChvZl9wcm9wZXJ0eV9yZWFkX2Jvb2wobnAsICJhcm0sZWNjLWRpc2FibGUi KSkgewo+ICsJCW1hc2sgfD0gQVVST1JBX0FDUl9FQ0NfRU47CgpBcyBwb2ludGVkIGJ5IFJ1c3Nl bGwgb24gdGhlIHByZXZpb3VzIHBhdGNoIGZvciBBVVJPUkFfQUNSX1BBUklUWV9FTiwKaGVyZSBh Z2FpbiBBVVJPUkFfQUNSX0VDQ19FTiBpcyBub3QgZGVjbGFyZWQgeWV0LgoKR3JlZ29yeQoKPiAr CX0KPiArCj4gIAlpZiAob2ZfcHJvcGVydHlfcmVhZF9ib29sKG5wLCAiYXJtLHBhcml0eS1lbmFi bGUiKSkgewo+ICAJCW1hc2sgfD0gQVVST1JBX0FDUl9QQVJJVFlfRU47Cj4gIAkJdmFsIHw9IEFV Uk9SQV9BQ1JfUEFSSVRZX0VOOwo+IC0tIAo+IDIuMTEuMAo+Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregory.clement@free-electrons.com (Gregory CLEMENT) Date: Mon, 03 Jul 2017 15:01:36 +0200 Subject: [PATCH 4/8] ARM: l2x0: add arm,ecc-enable property for aurora In-Reply-To: <20170630145106.29820-5-jlu@pengutronix.de> (Jan Luebbe's message of "Fri, 30 Jun 2017 16:51:02 +0200") References: <20170630145106.29820-1-jlu@pengutronix.de> <20170630145106.29820-5-jlu@pengutronix.de> Message-ID: <87fuedvfm7.fsf@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Jan, On ven., juin 30 2017, Jan Luebbe wrote: > From: Chris Packham > > The aurora cache on the Marvell Armada-XP SoC supports ECC protection > for the L2 data arrays. Add a "arm,ecc-enable" device tree property > which can be used to enable this. > > Signed-off-by: Chris Packham > [jlu at pengutronix.de: use aurora specific define AURORA_ACR_ECC_EN] > Signed-off-by: Jan Luebbe > --- > Documentation/devicetree/bindings/arm/l2c2x0.txt | 2 ++ > arch/arm/mm/cache-l2x0.c | 7 +++++++ > 2 files changed, 9 insertions(+) > > diff --git a/Documentation/devicetree/bindings/arm/l2c2x0.txt b/Documentation/devicetree/bindings/arm/l2c2x0.txt > index d9650c1788f4..6316e673307a 100644 > --- a/Documentation/devicetree/bindings/arm/l2c2x0.txt > +++ b/Documentation/devicetree/bindings/arm/l2c2x0.txt > @@ -76,6 +76,8 @@ Optional properties: > specified to indicate that such transforms are precluded. > - arm,parity-enable : enable parity checking on the L2 cache (L220 or PL310). > - arm,parity-disable : disable parity checking on the L2 cache (L220 or PL310). > +- arm,ecc-enable : enable ECC protection on the L2 cache > +- arm,ecc-disable : disable ECC protection on the L2 cache > - arm,outer-sync-disable : disable the outer sync operation on the L2 cache. > Some core tiles, especially ARM PB11MPCore have a faulty L220 cache that > will randomly hang unless outer sync operations are disabled. > diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c > index b70bee74750d..ea2a3dcc75a9 100644 > --- a/arch/arm/mm/cache-l2x0.c > +++ b/arch/arm/mm/cache-l2x0.c > @@ -1505,6 +1505,13 @@ static void __init aurora_of_parse(const struct device_node *np, > mask |= AURORA_ACR_FORCE_WRITE_POLICY_MASK; > } > > + if (of_property_read_bool(np, "arm,ecc-enable")) { > + mask |= AURORA_ACR_ECC_EN; > + val |= AURORA_ACR_ECC_EN; > + } else if (of_property_read_bool(np, "arm,ecc-disable")) { > + mask |= AURORA_ACR_ECC_EN; As pointed by Russell on the previous patch for AURORA_ACR_PARITY_EN, here again AURORA_ACR_ECC_EN is not declared yet. Gregory > + } > + > if (of_property_read_bool(np, "arm,parity-enable")) { > mask |= AURORA_ACR_PARITY_EN; > val |= AURORA_ACR_PARITY_EN; > -- > 2.11.0 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com