lkml.org 
[lkml]   [2015]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH V2 1/3] EDAC, amd64_edac: Extend scrub rate programmability feature for F15hM60h
From
Date
On 9/29/2015 6:45 AM, Borislav Petkov wrote:
>> @@ -216,12 +223,17 @@ static int set_scrub_rate(struct mem_ctl_info *mci, u32 bw)
>>
>> if (pvt->fam == 0xf)
>> min_scrubrate = 0x0;
>> + else if (pvt->fam == 0x15 && pvt->model == 0x60)
>> + min_scrubrate = 0x6;
>>
>> /* Erratum #505 */
>> if (pvt->fam == 0x15 && pvt->model < 0x10)
>> f15h_select_dct(pvt, 0);
>>
>> - return __set_scrub_rate(pvt->F3, bw, min_scrubrate);
>> + if (pvt->fam == 0x15 && pvt->model == 0x60)
>> + return __set_scrub_rate(pvt, bw, min_scrubrate);
>> +
>> + return __set_scrub_rate(pvt, bw, min_scrubrate);
> This looks sloppy:
>
> if (condition)
> return function()
> return function()
>
> I ended up committing the version below. Other two applied too.
>

Forgot to remove that conditional :|
Thanks for cleaning it up.

-Aravind.

>
>
> + if (pvt->fam == 0x15) {
> + /* Erratum #505 */
> + if (pvt->model < 0x10)
> + f15h_select_dct(pvt, 0);
>
> - return __set_scrub_rate(pvt->F3, bw, min_scrubrate);
> + if (pvt->model == 0x60)
> + min_scrubrate = 0x6;
> + }
> + return __set_scrub_rate(pvt, bw, min_scrubrate);
> }
>
> static int get_scrub_rate(struct mem_ctl_info *mci)
> @@ -230,11 +241,15 @@ static int get_scrub_rate(struct mem_ctl_info *mci)
> u32 scrubval = 0;
> int i, retval = -EINVAL;
>
>
> + if (pvt->fam == 0x15) {
> + /* Erratum #505 */
> + if (pvt->model < 0x10)
> + f15h_select_dct(pvt, 0);
>
> - amd64_read_pci_cfg(pvt->F3, SCRCTRL, &scrubval);
> + if (pvt->model == 0x60)
> + amd64_read_pci_cfg(pvt->F2, F15H_M60H_SCRCTRL, &scrubval);
> + } else
> + amd64_read_pci_cfg(pvt->F3, SCRCTRL, &scrubval);
>
> scrubval = scrubval & 0x001F;
>
>



\
 
 \ /
  Last update: 2015-09-29 17:21    [W:0.063 / U:1.988 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site