summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-11-17 02:33:24 +0300
committerOlof Johansson <olof@lixom.net>2019-11-17 02:33:25 +0300
commit3f6939aec712a15152c32516c1c543a91ac1e717 (patch)
treeabdcc64c23ba024dc2ebf3bd9d888fdaad4a270e
parent84a1b6e1d938be6a26a88083058884246415a5fc (diff)
parent7bd39bc6bfdf96f5df0f92199bbc1a3ee2f2adb8 (diff)
downloadlinux-3f6939aec712a15152c32516c1c543a91ac1e717.tar.xz
Merge tag 'scmi-fix-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/drivers
ARM SCMI fix for v5.5 Just a single fix to correct the SCMI fast channel doorbell ring logic when CONFIG_64BIT is not set. * tag 'scmi-fix-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: firmware: arm_scmi: Fix doorbell ring logic for !CONFIG_64BIT Link: https://lore.kernel.org/r/20191114164555.GA19398@bogus Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--drivers/firmware/arm_scmi/perf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c
index 4a8012e3cb8c..601af4edad5e 100644
--- a/drivers/firmware/arm_scmi/perf.c
+++ b/drivers/firmware/arm_scmi/perf.c
@@ -323,7 +323,7 @@ static void scmi_perf_fc_ring_db(struct scmi_fc_db_info *db)
if (db->mask)
val = ioread64_hi_lo(db->addr) & db->mask;
- iowrite64_hi_lo(db->set, db->addr);
+ iowrite64_hi_lo(db->set | val, db->addr);
}
#endif
}