All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Greg Ungerer <gerg@linux-m68k.org>,
	Sasha Levin <sashal@kernel.org>,
	linux-m68k@lists.linux-m68k.org
Subject: [PATCH AUTOSEL 4.19 07/18] m68knommu: fix overwriting of bits in ColdFire V3 cache control
Date: Wed, 19 Aug 2020 20:02:50 -0400	[thread overview]
Message-ID: <20200820000302.215560-7-sashal@kernel.org> (raw)
In-Reply-To: <20200820000302.215560-1-sashal@kernel.org>

From: Greg Ungerer <gerg@linux-m68k.org>

[ Upstream commit bdee0e793cea10c516ff48bf3ebb4ef1820a116b ]

The Cache Control Register (CACR) of the ColdFire V3 has bits that
control high level caching functions, and also enable/disable the use
of the alternate stack pointer register (the EUSP bit) to provide
separate supervisor and user stack pointer registers. The code as
it is today will blindly clear the EUSP bit on cache actions like
invalidation. So it is broken for this case - and that will result
in failed booting (interrupt entry and exit processing will be
completely hosed).

This only affects ColdFire V3 parts that support the alternate stack
register (like the 5329 for example) - generally speaking new parts do,
older parts don't. It has no impact on ColdFire V3 parts with the single
stack pointer, like the 5307 for example.

Fix the cache bit defines used, so they maintain the EUSP bit when
carrying out cache actions through the CACR register.

Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/m68k/include/asm/m53xxacr.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/m68k/include/asm/m53xxacr.h b/arch/m68k/include/asm/m53xxacr.h
index 9138a624c5c81..692f90e7fecc1 100644
--- a/arch/m68k/include/asm/m53xxacr.h
+++ b/arch/m68k/include/asm/m53xxacr.h
@@ -89,9 +89,9 @@
  * coherency though in all cases. And for copyback caches we will need
  * to push cached data as well.
  */
-#define CACHE_INIT	  CACR_CINVA
-#define CACHE_INVALIDATE  CACR_CINVA
-#define CACHE_INVALIDATED CACR_CINVA
+#define CACHE_INIT        (CACHE_MODE + CACR_CINVA - CACR_EC)
+#define CACHE_INVALIDATE  (CACHE_MODE + CACR_CINVA)
+#define CACHE_INVALIDATED (CACHE_MODE + CACR_CINVA)
 
 #define ACR0_MODE	((CONFIG_RAMBASE & 0xff000000) + \
 			 (0x000f0000) + \
-- 
2.25.1


  parent reply	other threads:[~2020-08-20  0:07 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-20  0:02 [PATCH AUTOSEL 4.19 01/18] scsi: ufs: Add DELAY_BEFORE_LPM quirk for Micron devices Sasha Levin
2020-08-20  0:02 ` Sasha Levin
2020-08-20  0:02 ` Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 02/18] scsi: target: tcmu: Fix crash in tcmu_flush_dcache_range on ARM Sasha Levin
2020-08-20  0:02   ` Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 03/18] media: budget-core: Improve exception handling in budget_register() Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 04/18] rtc: goldfish: Enable interrupt in set_alarm() when necessary Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 05/18] media: vpss: clean up resources in init Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 06/18] Input: psmouse - add a newline when printing 'proto' by sysfs Sasha Levin
2020-08-20  0:02 ` Sasha Levin [this message]
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 08/18] svcrdma: Fix another Receive buffer leak Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 09/18] xfs: fix inode quota reservation checks Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 10/18] jffs2: fix UAF problem Sasha Levin
2020-08-20  0:02   ` Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 11/18] ceph: fix use-after-free for fsc->mdsc Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 12/18] cpufreq: intel_pstate: Fix cpuinfo_max_freq when MSR_TURBO_RATIO_LIMIT is 0 Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 13/18] scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 14/18] virtio_ring: Avoid loop when vq is broken in virtqueue_poll Sasha Levin
2020-08-20  0:02   ` Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 15/18] tools/testing/selftests/cgroup/cgroup_util.c: cg_read_strcmp: fix null pointer dereference Sasha Levin
2020-08-20  0:02 ` [PATCH AUTOSEL 4.19 16/18] xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init Sasha Levin
2020-08-20  0:03 ` [PATCH AUTOSEL 4.19 17/18] alpha: fix annotation of io{read,write}{16,32}be() Sasha Levin
2020-08-20  0:03 ` [PATCH AUTOSEL 4.19 18/18] fs/signalfd.c: fix inconsistent return codes for signalfd4 Sasha Levin

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=20200820000302.215560-7-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=gerg@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@lists.linux-m68k.org \
    --cc=stable@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.