From: Peter Mamonov <pmamonov@gmail.com>
To: barebox@lists.infradead.org
Cc: Peter Mamonov <pmamonov@gmail.com>
Subject: [PATCH v3 09/12] MIPS: use CKSEG1 instead of KSEG1
Date: Tue, 22 May 2018 18:33:39 +0300 [thread overview]
Message-ID: <20180522153342.24933-10-pmamonov@gmail.com> (raw)
In-Reply-To: <20180522153342.24933-1-pmamonov@gmail.com>
KSEG1 constant is defined for 32 bit MIPS only. Use CKSEG1 which is defined for
both MIPS32 and MIPS64.
Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
---
arch/mips/boot/dtb.c | 4 ++--
arch/mips/lib/c-r4k.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/mips/boot/dtb.c b/arch/mips/boot/dtb.c
index e7633a5af..3f7f46641 100644
--- a/arch/mips/boot/dtb.c
+++ b/arch/mips/boot/dtb.c
@@ -30,10 +30,10 @@ void of_add_memory_bank(struct device_node *node, bool dump, int r,
if (IS_ENABLED(CONFIG_MMU)) {
sprintf(str, "kseg0_ram%d", r);
- barebox_add_memory_bank(str, KSEG0 | base, size);
+ barebox_add_memory_bank(str, CKSEG0 | base, size);
} else {
sprintf(str, "kseg1_ram%d", r);
- barebox_add_memory_bank(str, KSEG1 | base, size);
+ barebox_add_memory_bank(str, CKSEG1 | base, size);
}
if (dump)
diff --git a/arch/mips/lib/c-r4k.c b/arch/mips/lib/c-r4k.c
index 150205840..cb0544a53 100644
--- a/arch/mips/lib/c-r4k.c
+++ b/arch/mips/lib/c-r4k.c
@@ -58,14 +58,14 @@ void flush_cache_all(void)
dcache_size = c->dcache.waysize * c->dcache.ways;
lsize = c->dcache.linesz;
- aend = (KSEG0 + dcache_size - 1) & ~(lsize - 1);
- for (addr = KSEG0; addr <= aend; addr += lsize)
+ aend = (CKSEG0 + dcache_size - 1) & ~(lsize - 1);
+ for (addr = CKSEG0; addr <= aend; addr += lsize)
cache_op(Index_Writeback_Inv_D, addr);
icache_size = c->icache.waysize * c->icache.ways;
lsize = c->icache.linesz;
- aend = (KSEG0 + icache_size - 1) & ~(lsize - 1);
- for (addr = KSEG0; addr <= aend; addr += lsize)
+ aend = (CKSEG0 + icache_size - 1) & ~(lsize - 1);
+ for (addr = CKSEG0; addr <= aend; addr += lsize)
cache_op(Index_Invalidate_I, addr);
/* secondatory cache skipped */
--
2.17.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-05-22 15:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-22 15:33 [PATCH v3 00/12] various fixes for MIPS64 Peter Mamonov
2018-05-22 15:33 ` [PATCH v3 01/12] resource: fix iomem_resource.end for 64 bit systems Peter Mamonov
2018-05-22 15:33 ` [PATCH v3 02/12] fs: fix memory access via /dev/mem for MIPS64 Peter Mamonov
2018-05-24 10:47 ` Sascha Hauer
2018-05-24 14:01 ` [PATCH v4] " Peter Mamonov
2018-06-13 8:31 ` Sascha Hauer
2018-06-13 16:17 ` [RESEND " Peter Mamonov
2018-06-14 5:36 ` Sascha Hauer
2018-05-22 15:33 ` [PATCH v3 03/12] mtd: cfi-flash: fix write_buff() for 64 bit systems Peter Mamonov
2018-05-22 15:33 ` [PATCH v3 04/12] i2c-mux-pca954x: fix out-of-bounds write " Peter Mamonov
2018-05-22 15:33 ` [PATCH v3 05/12] MIPS: import 64-bit address conversion macros Peter Mamonov
2018-05-22 15:33 ` [PATCH v3 06/12] include/common.h: move IOMEM declaration for MIPS to arch/mips/include/asm/io.h Peter Mamonov
2018-05-22 15:33 ` [PATCH v3 07/12] MIPS: add proper IOMEM() declaration for MIPS64 Peter Mamonov
2018-05-22 15:33 ` [PATCH v3 08/12] MIPS: fix copy_to_link_location for 64 bit mode Peter Mamonov
2018-05-22 15:33 ` Peter Mamonov [this message]
2018-05-22 15:33 ` [PATCH v3 10/12] MIPS: add PHYS_ADDR_T_64BIT option Peter Mamonov
2018-05-22 15:33 ` [PATCH v3 11/12] MIPS: 64BIT selects PHYS_ADDR_T_64BIT Peter Mamonov
2018-05-22 15:33 ` [PATCH v3 12/12] MIPS: don't use optimized string functions for MIPS64 Peter Mamonov
2018-05-23 8:11 ` [PATCH v3 00/12] various fixes " Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180522153342.24933-10-pmamonov@gmail.com \
--to=pmamonov@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox