diff mbox

[RFC,04/21] target-arm: preserve RAO/WI bits of ARMv7 SCTLR

Message ID 1386060535-15908-5-git-send-email-s.fedorov@samsung.com
State New
Headers show

Commit Message

Sergey Fedorov Dec. 3, 2013, 8:48 a.m. UTC 
From: Svetlana Fedoseeva <s.fedoseeva@samsung.com>

Signed-off-by: Svetlana Fedoseeva <s.fedoseeva@samsung.com>
Signed-off-by: Sergey Fedorov <s.fedorov@samsung.com>
---
 target-arm/helper.c |    4 ++++
 1 file changed, 4 insertions(+)

Comments

Peter Crosthwaite Dec. 3, 2013, 12:17 p.m. UTC | #1 
On Tue, Dec 3, 2013 at 6:48 PM, Sergey Fedorov <s.fedorov@samsung.com> wrote:
> From: Svetlana Fedoseeva <s.fedoseeva@samsung.com>
>
> Signed-off-by: Svetlana Fedoseeva <s.fedoseeva@samsung.com>
> Signed-off-by: Sergey Fedorov <s.fedorov@samsung.com>
> ---
>  target-arm/helper.c |    4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index 6642e53..d7922ad 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -1507,6 +1507,10 @@ static const ARMCPRegInfo lpae_cp_reginfo[] = {
>
>  static int sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
>  {
> +    if (arm_feature(env, ARM_FEATURE_V7)) {
> +        value = value | 0x00c50078; /* This bits are RAO/WI */

Magic number. "these bits ".

> +    }
> +
>      env->cp15.c1_sys = value;
>      /* ??? Lots of these bits are not implemented.  */
>      /* This may enable/disable the MMU, so do a TLB flush.  */
> --
> 1.7.9.5
>
>
Sergey Fedorov Dec. 4, 2013, 9:55 a.m. UTC | #2 
On 12/03/2013 04:17 PM, Peter Crosthwaite wrote:
> On Tue, Dec 3, 2013 at 6:48 PM, Sergey Fedorov <s.fedorov@samsung.com> wrote:
>> From: Svetlana Fedoseeva <s.fedoseeva@samsung.com>
>>
>> Signed-off-by: Svetlana Fedoseeva <s.fedoseeva@samsung.com>
>> Signed-off-by: Sergey Fedorov <s.fedorov@samsung.com>
>> ---
>>   target-arm/helper.c |    4 ++++
>>   1 file changed, 4 insertions(+)
>>
>> diff --git a/target-arm/helper.c b/target-arm/helper.c
>> index 6642e53..d7922ad 100644
>> --- a/target-arm/helper.c
>> +++ b/target-arm/helper.c
>> @@ -1507,6 +1507,10 @@ static const ARMCPRegInfo lpae_cp_reginfo[] = {
>>
>>   static int sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
>>   {
>> +    if (arm_feature(env, ARM_FEATURE_V7)) {
>> +        value = value | 0x00c50078; /* This bits are RAO/WI */
> Magic number. "these bits ".

Would be acceptable to substitute this magic number with "bitshifted 
constants combined with bitwise or", e.g. as in vmsa_ttbcr_raw_write()?

>
>> +    }
>> +
>>       env->cp15.c1_sys = value;
>>       /* ??? Lots of these bits are not implemented.  */
>>       /* This may enable/disable the MMU, so do a TLB flush.  */
>> --
>> 1.7.9.5
>>
>>
>
Peter Crosthwaite Dec. 19, 2013, 3:19 a.m. UTC | #3 
On Wed, Dec 4, 2013 at 7:55 PM, Fedorov Sergey <s.fedorov@samsung.com> wrote:
>
> On 12/03/2013 04:17 PM, Peter Crosthwaite wrote:
>>
>> On Tue, Dec 3, 2013 at 6:48 PM, Sergey Fedorov <s.fedorov@samsung.com>
>> wrote:
>>>
>>> From: Svetlana Fedoseeva <s.fedoseeva@samsung.com>
>>>
>>> Signed-off-by: Svetlana Fedoseeva <s.fedoseeva@samsung.com>
>>> Signed-off-by: Sergey Fedorov <s.fedorov@samsung.com>
>>> ---
>>>   target-arm/helper.c |    4 ++++
>>>   1 file changed, 4 insertions(+)
>>>
>>> diff --git a/target-arm/helper.c b/target-arm/helper.c
>>> index 6642e53..d7922ad 100644
>>> --- a/target-arm/helper.c
>>> +++ b/target-arm/helper.c
>>> @@ -1507,6 +1507,10 @@ static const ARMCPRegInfo lpae_cp_reginfo[] = {
>>>
>>>   static int sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri,
>>> uint64_t value)
>>>   {
>>> +    if (arm_feature(env, ARM_FEATURE_V7)) {
>>> +        value = value | 0x00c50078; /* This bits are RAO/WI */
>>
>> Magic number. "these bits ".
>
>
> Would be acceptable to substitute this magic number with "bitshifted
> constants combined with bitwise or", e.g. as in vmsa_ttbcr_raw_write()?
>

Yes I think so, that will make life easier for the big macro
conversion (one day) :)

Regards,
Peter

>
>>
>>> +    }
>>> +
>>>       env->cp15.c1_sys = value;
>>>       /* ??? Lots of these bits are not implemented.  */
>>>       /* This may enable/disable the MMU, so do a TLB flush.  */
>>> --
>>> 1.7.9.5
>>>
>>>
>>
>
> --
> Best regards,
> Sergey Fedorov, Junior Software Engineer,
> Samsung R&D Institute Rus.
> E-mail: s.fedorov@samsung.com
>
>
diff mbox

Patch

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 6642e53..d7922ad 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -1507,6 +1507,10 @@  static const ARMCPRegInfo lpae_cp_reginfo[] = {
 
 static int sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
 {
+    if (arm_feature(env, ARM_FEATURE_V7)) {
+        value = value | 0x00c50078; /* This bits are RAO/WI */
+    }
+
     env->cp15.c1_sys = value;
     /* ??? Lots of these bits are not implemented.  */
     /* This may enable/disable the MMU, so do a TLB flush.  */