From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Subject: Re: [RFC PATCH] Remove CONFIG_DCACHE_WORD_ACCESS Date: Wed, 12 Mar 2014 07:37:20 +1100 Message-ID: <1394570240.4840.48.camel@pasglop> References: <1393964591.20435.58.camel@joe-AO722> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1393964591.20435.58.camel@joe-AO722> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: "Linuxppc-dev" To: Joe Perches Cc: linux-arch , Anton Blanchard , Russell King , Catalin Marinas , x86@kernel.org, Will Deacon , linux-kernel@vger.kernel.org, Ingo Molnar , Paul Mackerras , Alexander Viro , "H. Peter Anvin" , linux-fsdevel , Thomas Gleixner , linuxppc-dev , linux-arm-kernel@lists.infradead.org List-Id: linux-arch.vger.kernel.org T24gVHVlLCAyMDE0LTAzLTA0IGF0IDEyOjIzIC0wODAwLCBKb2UgUGVyY2hlcyB3cm90ZToKPiBJ dCBzZWVtcyB0byBkdXBsaWNhdGUgQ09ORklHX0hBVkVfRUZGSUNJRU5UX1VOQUxJR05FRF9BQ0NF U1MKPiBzbyB1c2UgdGhhdCBpbnN0ZWFkLgo+IAo+IFRoaXMgY2hhbmdlcyB0aGUgIUNQVV9MSVRU TEVfRU5ESUFOIHBvd2VycGMgYXJjaCB0byB1c2UgdW5hbGlnbmVkCj4gYWNjZXNzZXMgaW4gZnMv ZGNhY2hlLmMgYW5kIGZzL25hbWVpLmMgYXMKPiBDT05GSUdfSEFWRV9FRkZJQ0lFTlRfVU5BTElH TkVEX0FDQ0VTUyBpcyBlbmFibGVkIGZvciB0aGF0IGFyY2guCj4gCj4gUmVtb3ZlIHRoZSBub3cg dW51c2VkIERDQUNIRV9XT1JEX0FDQ0VTUyBkZWZpbmVzICYgdXNlcy4KCkludGVyZXN0aW5nLi4g d2UgaGF2ZSB3b3JkLWF0LWEtdGltZSBidXQgd2UgbmV2ZXIgZW5hYmxlZApEQ0FDSEVfV09SRF9B Q0NFU1MsIEkgd29uZGVyIHdoeSB0aGF0IGlzLiBJbiBmYWN0LCB3ZSBzaG91bGQKcHJvYmFibHkg ZG8gaXQgZm9yIExFIGFzIHdlbGwgZm9yIFA4IGlmIHdlIGNhbiBtYWtlIGEgUDgKb25seSBjb25m aWcgb3B0aW9uLi4uCgpBbnRvbiwgd2hhdCBkbyB5b3UgcmVja29uIGhlcmUgPwoKQ2hlZXJzLApC ZW4uCgo+IFNpZ25lZC1vZmYtYnk6IEpvZSBQZXJjaGVzIDxqb2VAcGVyY2hlcy5jb20+Cj4gLS0t Cj4gIGFyY2gvYXJtL0tjb25maWcgICAgICAgICAgICAgICAgICAgICAgfCAxIC0KPiAgYXJjaC9h cm0vaW5jbHVkZS9hc20vd29yZC1hdC1hLXRpbWUuaCB8IDQgKystLQo+ICBhcmNoL2FybTY0L0tj b25maWcgICAgICAgICAgICAgICAgICAgIHwgMSAtCj4gIGFyY2gveDg2L0tjb25maWcgICAgICAg ICAgICAgICAgICAgICAgfCAxIC0KPiAgZnMvS2NvbmZpZyAgICAgICAgICAgICAgICAgICAgICAg ICAgICB8IDQgLS0tLQo+ICBmcy9kY2FjaGUuYyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwg MiArLQo+ICBmcy9uYW1laS5jICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQo+ICA3 IGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCj4gCj4gZGlm ZiAtLWdpdCBhL2FyY2gvYXJtL0tjb25maWcgYi9hcmNoL2FybS9LY29uZmlnCj4gaW5kZXggNjIz YTI3Mi4uZDVhMmU2MCAxMDA2NDQKPiAtLS0gYS9hcmNoL2FybS9LY29uZmlnCj4gKysrIGIvYXJj aC9hcm0vS2NvbmZpZwo+IEBAIC0xMiw3ICsxMiw2IEBAIGNvbmZpZyBBUk0KPiAgCXNlbGVjdCBC VUlMRFRJTUVfRVhUQUJMRV9TT1JUIGlmIE1NVQo+ICAJc2VsZWN0IENMT05FX0JBQ0tXQVJEUwo+ ICAJc2VsZWN0IENQVV9QTSBpZiAoU1VTUEVORCB8fCBDUFVfSURMRSkKPiAtCXNlbGVjdCBEQ0FD SEVfV09SRF9BQ0NFU1MgaWYgSEFWRV9FRkZJQ0lFTlRfVU5BTElHTkVEX0FDQ0VTUwo+ICAJc2Vs ZWN0IEdFTkVSSUNfQVRPTUlDNjQgaWYgKENQVV9WN00gfHwgQ1BVX1Y2IHx8ICFDUFVfMzJ2Nksg fHwgIUFFQUJJKQo+ICAJc2VsZWN0IEdFTkVSSUNfQ0xPQ0tFVkVOVFNfQlJPQURDQVNUIGlmIFNN UAo+ICAJc2VsZWN0IEdFTkVSSUNfSURMRV9QT0xMX1NFVFVQCj4gZGlmZiAtLWdpdCBhL2FyY2gv YXJtL2luY2x1ZGUvYXNtL3dvcmQtYXQtYS10aW1lLmggYi9hcmNoL2FybS9pbmNsdWRlL2FzbS93 b3JkLWF0LWEtdGltZS5oCj4gaW5kZXggYTZkMGEyOS4uNzc4YjJhZCAxMDA2NDQKPiAtLS0gYS9h cmNoL2FybS9pbmNsdWRlL2FzbS93b3JkLWF0LWEtdGltZS5oCj4gKysrIGIvYXJjaC9hcm0vaW5j bHVkZS9hc20vd29yZC1hdC1hLXRpbWUuaAo+IEBAIC01NCw3ICs1NCw3IEBAIHN0YXRpYyBpbmxp bmUgdW5zaWduZWQgbG9uZyBmaW5kX3plcm8odW5zaWduZWQgbG9uZyBtYXNrKQo+ICAjaW5jbHVk ZSA8YXNtLWdlbmVyaWMvd29yZC1hdC1hLXRpbWUuaD4KPiAgI2VuZGlmCj4gIAo+IC0jaWZkZWYg Q09ORklHX0RDQUNIRV9XT1JEX0FDQ0VTUwo+ICsjaWZkZWYgQ09ORklHX0hBVkVfRUZGSUNJRU5U X1VOQUxJR05FRF9BQ0NFU1MKPiAgCj4gIC8qCj4gICAqIExvYWQgYW4gdW5hbGlnbmVkIHdvcmQg ZnJvbSBrZXJuZWwgc3BhY2UuCj4gQEAgLTk0LDUgKzk0LDUgQEAgc3RhdGljIGlubGluZSB1bnNp Z25lZCBsb25nIGxvYWRfdW5hbGlnbmVkX3plcm9wYWQoY29uc3Qgdm9pZCAqYWRkcikKPiAgCXJl dHVybiByZXQ7Cj4gIH0KPiAgCj4gLSNlbmRpZgkvKiBEQ0FDSEVfV09SRF9BQ0NFU1MgKi8KPiAr I2VuZGlmCS8qIEhBVkVfRUZGSUNJRU5UX1VOQUxJR05FRF9BQ0NFU1MgKi8KPiAgI2VuZGlmIC8q IF9fQVNNX0FSTV9XT1JEX0FUX0FfVElNRV9IICovCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQv S2NvbmZpZyBiL2FyY2gvYXJtNjQvS2NvbmZpZwo+IGluZGV4IDc2NGQ2ODIuLjJkNjk3OGMgMTAw NjQ0Cj4gLS0tIGEvYXJjaC9hcm02NC9LY29uZmlnCj4gKysrIGIvYXJjaC9hcm02NC9LY29uZmln Cj4gQEAgLTEzLDcgKzEzLDYgQEAgY29uZmlnIEFSTTY0Cj4gIAlzZWxlY3QgQ0xPTkVfQkFDS1dB UkRTCj4gIAlzZWxlY3QgQ09NTU9OX0NMSwo+ICAJc2VsZWN0IENQVV9QTSBpZiAoU1VTUEVORCB8 fCBDUFVfSURMRSkKPiAtCXNlbGVjdCBEQ0FDSEVfV09SRF9BQ0NFU1MKPiAgCXNlbGVjdCBHRU5F UklDX0NMT0NLRVZFTlRTCj4gIAlzZWxlY3QgR0VORVJJQ19DTE9DS0VWRU5UU19CUk9BRENBU1Qg aWYgU01QCj4gIAlzZWxlY3QgR0VORVJJQ19JT01BUAo+IGRpZmYgLS1naXQgYS9hcmNoL3g4Ni9L Y29uZmlnIGIvYXJjaC94ODYvS2NvbmZpZwo+IGluZGV4IGFiYjI2MWUuLjYwY2ZhMDczIDEwMDY0 NAo+IC0tLSBhL2FyY2gveDg2L0tjb25maWcKPiArKysgYi9hcmNoL3g4Ni9LY29uZmlnCj4gQEAg LTk4LDcgKzk4LDYgQEAgY29uZmlnIFg4Ngo+ICAJc2VsZWN0IENMS0VWVF9JODI1Mwo+ICAJc2Vs ZWN0IEFSQ0hfSEFWRV9OTUlfU0FGRV9DTVBYQ0hHCj4gIAlzZWxlY3QgR0VORVJJQ19JT01BUAo+ IC0Jc2VsZWN0IERDQUNIRV9XT1JEX0FDQ0VTUwo+ICAJc2VsZWN0IEdFTkVSSUNfU01QX0lETEVf VEhSRUFECj4gIAlzZWxlY3QgQVJDSF9XQU5UX0lQQ19QQVJTRV9WRVJTSU9OIGlmIFg4Nl8zMgo+ ICAJc2VsZWN0IEhBVkVfQVJDSF9TRUNDT01QX0ZJTFRFUgo+IGRpZmYgLS1naXQgYS9mcy9LY29u ZmlnIGIvZnMvS2NvbmZpZwo+IGluZGV4IDMxMjM5M2YuLjc1MTEyNzEgMTAwNjQ0Cj4gLS0tIGEv ZnMvS2NvbmZpZwo+ICsrKyBiL2ZzL0tjb25maWcKPiBAQCAtNCwxMCArNCw2IEBACj4gIAo+ICBt ZW51ICJGaWxlIHN5c3RlbXMiCj4gIAo+IC0jIFVzZSB1bmFsaWduZWQgd29yZCBkY2FjaGUgYWNj ZXNzZXMKPiAtY29uZmlnIERDQUNIRV9XT1JEX0FDQ0VTUwo+IC0gICAgICAgYm9vbAo+IC0KPiAg aWYgQkxPQ0sKPiAgCj4gIHNvdXJjZSAiZnMvZXh0Mi9LY29uZmlnIgo+IGRpZmYgLS1naXQgYS9m cy9kY2FjaGUuYyBiL2ZzL2RjYWNoZS5jCj4gaW5kZXggMjY1ZTBjZS4uNGUzYzE5NSAxMDA2NDQK PiAtLS0gYS9mcy9kY2FjaGUuYwo+ICsrKyBiL2ZzL2RjYWNoZS5jCj4gQEAgLTE2Myw3ICsxNjMs NyBAQCBpbnQgcHJvY19ucl9kZW50cnkoY3RsX3RhYmxlICp0YWJsZSwgaW50IHdyaXRlLCB2b2lk IF9fdXNlciAqYnVmZmVyLAo+ICAgKiBDb21wYXJlIDIgbmFtZSBzdHJpbmdzLCByZXR1cm4gMCBp ZiB0aGV5IG1hdGNoLCBvdGhlcndpc2Ugbm9uLXplcm8uCj4gICAqIFRoZSBzdHJpbmdzIGFyZSBi b3RoIGNvdW50IGJ5dGVzIGxvbmcsIGFuZCBjb3VudCBpcyBub24temVyby4KPiAgICovCj4gLSNp ZmRlZiBDT05GSUdfRENBQ0hFX1dPUkRfQUNDRVNTCj4gKyNpZmRlZiBDT05GSUdfSEFWRV9FRkZJ Q0lFTlRfVU5BTElHTkVEX0FDQ0VTUwo+ICAKPiAgI2luY2x1ZGUgPGFzbS93b3JkLWF0LWEtdGlt ZS5oPgo+ICAvKgo+IGRpZmYgLS1naXQgYS9mcy9uYW1laS5jIGIvZnMvbmFtZWkuYwo+IGluZGV4 IDM4NWY3ODEuLjFlZTMzY2EgMTAwNjQ0Cj4gLS0tIGEvZnMvbmFtZWkuYwo+ICsrKyBiL2ZzL25h bWVpLmMKPiBAQCAtMTYxOCw3ICsxNjE4LDcgQEAgc3RhdGljIGlubGluZSBpbnQgbmVzdGVkX3N5 bWxpbmsoc3RydWN0IHBhdGggKnBhdGgsIHN0cnVjdCBuYW1laWRhdGEgKm5kKQo+ICAgKiAgIHRo ZSBmaW5hbCBtYXNrIi4gQWdhaW4sIHRoYXQgY291bGQgYmUgcmVwbGFjZWQgd2l0aCBhCj4gICAq ICAgZWZmaWNpZW50IHBvcHVsYXRpb24gY291bnQgaW5zdHJ1Y3Rpb24gb3Igc2ltaWxhci4KPiAg ICovCj4gLSNpZmRlZiBDT05GSUdfRENBQ0hFX1dPUkRfQUNDRVNTCj4gKyNpZmRlZiBDT05GSUdf SEFWRV9FRkZJQ0lFTlRfVU5BTElHTkVEX0FDQ0VTUwo+ICAKPiAgI2luY2x1ZGUgPGFzbS93b3Jk LWF0LWEtdGltZS5oPgo+ICAKPiAKPiAKPiAtLQo+IFRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBs aXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC1hcmNoIiBpbgo+IHRoZSBib2R5 IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCj4gTW9yZSBtYWpvcmRv bW8gaW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sCgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTGludXhwcGMt ZGV2IG1haWxpbmcgbGlzdApMaW51eHBwYy1kZXZAbGlzdHMub3psYWJzLm9yZwpodHRwczovL2xp c3RzLm96bGFicy5vcmcvbGlzdGluZm8vbGludXhwcGMtZGV2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org ([63.228.1.57]:38928 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753782AbaCKUjK (ORCPT ); Tue, 11 Mar 2014 16:39:10 -0400 Message-ID: <1394570240.4840.48.camel@pasglop> Subject: Re: [RFC PATCH] Remove CONFIG_DCACHE_WORD_ACCESS From: Benjamin Herrenschmidt Date: Wed, 12 Mar 2014 07:37:20 +1100 In-Reply-To: <1393964591.20435.58.camel@joe-AO722> References: <1393964591.20435.58.camel@joe-AO722> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Joe Perches Cc: linux-arch , Paul Mackerras , Russell King , Catalin Marinas , Will Deacon , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Alexander Viro , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-fsdevel , linuxppc-dev , Anton Blanchard Message-ID: <20140311203720.waVVX3QsCpqMCpOQ_ayfNWsyi_G_Vyjv0r1e_hK1Aq8@z> On Tue, 2014-03-04 at 12:23 -0800, Joe Perches wrote: > It seems to duplicate CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS > so use that instead. > > This changes the !CPU_LITTLE_ENDIAN powerpc arch to use unaligned > accesses in fs/dcache.c and fs/namei.c as > CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is enabled for that arch. > > Remove the now unused DCACHE_WORD_ACCESS defines & uses. Interesting.. we have word-at-a-time but we never enabled DCACHE_WORD_ACCESS, I wonder why that is. In fact, we should probably do it for LE as well for P8 if we can make a P8 only config option... Anton, what do you reckon here ? Cheers, Ben. > Signed-off-by: Joe Perches > --- > arch/arm/Kconfig | 1 - > arch/arm/include/asm/word-at-a-time.h | 4 ++-- > arch/arm64/Kconfig | 1 - > arch/x86/Kconfig | 1 - > fs/Kconfig | 4 ---- > fs/dcache.c | 2 +- > fs/namei.c | 2 +- > 7 files changed, 4 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 623a272..d5a2e60 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -12,7 +12,6 @@ config ARM > select BUILDTIME_EXTABLE_SORT if MMU > select CLONE_BACKWARDS > select CPU_PM if (SUSPEND || CPU_IDLE) > - select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS > select GENERIC_ATOMIC64 if (CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI) > select GENERIC_CLOCKEVENTS_BROADCAST if SMP > select GENERIC_IDLE_POLL_SETUP > diff --git a/arch/arm/include/asm/word-at-a-time.h b/arch/arm/include/asm/word-at-a-time.h > index a6d0a29..778b2ad 100644 > --- a/arch/arm/include/asm/word-at-a-time.h > +++ b/arch/arm/include/asm/word-at-a-time.h > @@ -54,7 +54,7 @@ static inline unsigned long find_zero(unsigned long mask) > #include > #endif > > -#ifdef CONFIG_DCACHE_WORD_ACCESS > +#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS > > /* > * Load an unaligned word from kernel space. > @@ -94,5 +94,5 @@ static inline unsigned long load_unaligned_zeropad(const void *addr) > return ret; > } > > -#endif /* DCACHE_WORD_ACCESS */ > +#endif /* HAVE_EFFICIENT_UNALIGNED_ACCESS */ > #endif /* __ASM_ARM_WORD_AT_A_TIME_H */ > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 764d682..2d6978c 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -13,7 +13,6 @@ config ARM64 > select CLONE_BACKWARDS > select COMMON_CLK > select CPU_PM if (SUSPEND || CPU_IDLE) > - select DCACHE_WORD_ACCESS > select GENERIC_CLOCKEVENTS > select GENERIC_CLOCKEVENTS_BROADCAST if SMP > select GENERIC_IOMAP > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index abb261e..60cfa073 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -98,7 +98,6 @@ config X86 > select CLKEVT_I8253 > select ARCH_HAVE_NMI_SAFE_CMPXCHG > select GENERIC_IOMAP > - select DCACHE_WORD_ACCESS > select GENERIC_SMP_IDLE_THREAD > select ARCH_WANT_IPC_PARSE_VERSION if X86_32 > select HAVE_ARCH_SECCOMP_FILTER > diff --git a/fs/Kconfig b/fs/Kconfig > index 312393f..7511271 100644 > --- a/fs/Kconfig > +++ b/fs/Kconfig > @@ -4,10 +4,6 @@ > > menu "File systems" > > -# Use unaligned word dcache accesses > -config DCACHE_WORD_ACCESS > - bool > - > if BLOCK > > source "fs/ext2/Kconfig" > diff --git a/fs/dcache.c b/fs/dcache.c > index 265e0ce..4e3c195 100644 > --- a/fs/dcache.c > +++ b/fs/dcache.c > @@ -163,7 +163,7 @@ int proc_nr_dentry(ctl_table *table, int write, void __user *buffer, > * Compare 2 name strings, return 0 if they match, otherwise non-zero. > * The strings are both count bytes long, and count is non-zero. > */ > -#ifdef CONFIG_DCACHE_WORD_ACCESS > +#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS > > #include > /* > diff --git a/fs/namei.c b/fs/namei.c > index 385f781..1ee33ca 100644 > --- a/fs/namei.c > +++ b/fs/namei.c > @@ -1618,7 +1618,7 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd) > * the final mask". Again, that could be replaced with a > * efficient population count instruction or similar. > */ > -#ifdef CONFIG_DCACHE_WORD_ACCESS > +#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS > > #include > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arch" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html