Skip to content

GitLab

Unverified Commit 09895d42 authored by Dimitris Papastamos's avatar Dimitris Papastamos Committed by GitHub
Browse files

Merge pull request #1520 from robertovargas-arm/cci-dsb 

cci: Use dsb to wait before reading status register
parents 3ba92957 fcb52dbf
Show whitespace changes
Inline Side-by-side
drivers/arm/cci/cci.c
View file @ 09895d42
...@@ -147,7 +147,7 @@ void cci_enable_snoop_dvm_reqs(unsigned int master_id) ...@@ -147,7 +147,7 @@ void cci_enable_snoop_dvm_reqs(unsigned int master_id)
* Wait for the completion of the write to the Snoop Control Register * Wait for the completion of the write to the Snoop Control Register
* before testing the change_pending bit * before testing the change_pending bit
*/ */
dmbish(); dsbish();
/* Wait for the dust to settle down */ /* Wait for the dust to settle down */
while (mmio_read_32(cci_base + STATUS_REG) & CHANGE_PENDING_BIT) while (mmio_read_32(cci_base + STATUS_REG) & CHANGE_PENDING_BIT)
...@@ -174,7 +174,7 @@ void cci_disable_snoop_dvm_reqs(unsigned int master_id) ...@@ -174,7 +174,7 @@ void cci_disable_snoop_dvm_reqs(unsigned int master_id)
* Wait for the completion of the write to the Snoop Control Register * Wait for the completion of the write to the Snoop Control Register
* before testing the change_pending bit * before testing the change_pending bit
*/ */
dmbish(); dsbish();
/* Wait for the dust to settle down */ /* Wait for the dust to settle down */
while (mmio_read_32(cci_base + STATUS_REG) & CHANGE_PENDING_BIT) while (mmio_read_32(cci_base + STATUS_REG) & CHANGE_PENDING_BIT)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment