Re: [PATCH V3 4/4] edac, amd64_edac: Add F15h M60h support

[Aravind Gopalakrishnan <aravind.gopalakrishnan@amd.com>]

On 10/30/2014 7:45 AM, Borislav Petkov wrote:
> On Wed, Oct 29, 2014 at 04:18:03PM -0500, Aravind Gopalakrishnan wrote:
>> diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
>> index bbd6514..1092ddd 100644
>> --- a/drivers/edac/amd64_edac.c
>> +++ b/drivers/edac/amd64_edac.c
>> @@ -692,9 +692,19 @@ static void debug_dump_dramcfg_low(struct amd64_pvt *pvt, u32 dclr, int chan)
>>   {
>>   	edac_dbg(1, "F2x%d90 (DRAM Cfg Low): 0x%08x\n", chan, dclr);
>>   
>> -	edac_dbg(1, "  DIMM type: %sbuffered; all DIMMs support ECC: %s\n",
>> -		 (dclr & BIT(16)) ?  "un" : "",
> Why did we drop bit 16 about the unbuffered-ness of the DIMMs?

Because it gets printed anyway when we do
edac_dbg(1, "  DIMM type: %s\n", edac_mem_types[pvt->dram_type]);

>> @@ -813,25 +823,57 @@ static void read_dct_base_mask(struct amd64_pvt *pvt)
>>   	}
>>   }
>>   
>> -static enum mem_type determine_memory_type(struct amd64_pvt *pvt, int cs)
>> +static void determine_memory_type(struct amd64_pvt *pvt)
>>   {
>> -	enum mem_type type;
>> -
>> -	/* F15h supports only DDR3 */
>> -	if (pvt->fam >= 0x15)
>> -		type = (pvt->dclr0 & BIT(16)) ?	MEM_DDR3 : MEM_RDDR3;
>> -	else if (pvt->fam == 0x10 || pvt->ext_model >= K8_REV_F) {
>> -		if (pvt->dchr0 & DDR3_MODE)
>> -			type = (pvt->dclr0 & BIT(16)) ?	MEM_DDR3 : MEM_RDDR3;
>> -		else
>> -			type = (pvt->dclr0 & BIT(16)) ? MEM_DDR2 : MEM_RDDR2;
>> -	} else {
>> -		type = (pvt->dclr0 & BIT(18)) ? MEM_DDR : MEM_RDDR;
>> +	switch (pvt->fam) {
>> +	case 0xf:
>> +		if (pvt->ext_model < K8_REV_F) {
>> +			pvt->dram_type = (pvt->dclr0 & BIT(18)) ?
>> +					 MEM_DDR : MEM_RDDR;
>> +			break;
>> +		}
>> +		/* ext_model >= k8_rev_f, fall down below */
>> +	case 0x10:
>> +		if (!(pvt->dchr0 & DDR3_MODE)) {
>> +			pvt->dram_type = (pvt->dclr0 & BIT(16)) ?
>> +					 MEM_DDR2 : MEM_RDDR2;
>> +			break;
>> +		}
>> +		/* If f10h supports DDR3, it will be handled by cases below */
>> +	case 0x15:
>> +		/* F15h supports only DDR3 */
>> +		if (pvt->model == 0x60) {
>> +			/*
>> +			 * We use a Chip Select value of '0' to obtain dcsm.
>> +			 * Theoretically, it is possible to populate LRDIMMs
>> +			 * of different 'Rank' value on a DCT. But this is not
>> +			 * a common case. So, it's reasonable to assume all
>> +			 * DIMMs are going to be of same 'type' until proven
>> +			 * otherwise.
>> +			 */
>> +			u32 dram_ctrl;
>> +			u32 dcsm = pvt->csels[0].csmasks[0];
>> +
>> +			amd64_read_dct_pci_cfg(pvt, 0, DRAM_CONTROL,
>> +					       &dram_ctrl);
>> +			if (((dram_ctrl >> 8) & 0x7) == 0x2)
>> +				pvt->dram_type = MEM_DDR4;
>> +			else if (pvt->dclr0 & BIT(16))
>> +				pvt->dram_type = MEM_DDR3;
>> +			else if (dcsm & 0x3)
>> +				pvt->dram_type = MEM_LRDDR3;
>> +			else
>> +				pvt->dram_type = MEM_RDDR3;
>> +			break;
>> +		}
>> +		/* other f15h models fall down below */
>> +	case 0x16:
>> +		pvt->dram_type = (pvt->dclr0 & BIT(16)) ?
>> +				 MEM_DDR3 : MEM_RDDR3;
>> +		break;
>> +	default:
>> +		pvt->dram_type = MEM_EMPTY;
>>   	}
> Ok, I went and did cleanup that version here by flipping the logic
> in the tests and thus saving an indentation level. Also, I've added
> explicit "return"s in the respective cases in order to follow through
> the code more easily. Here's how the whole function looks like now - I
> think it is a bit better readable this way. Full patch below:
>
> static void determine_memory_type(struct amd64_pvt *pvt)
> {
>          u32 dram_ctrl, dcsm;
>
>          switch (pvt->fam) {
>          case 0xf:
>                  if (pvt->ext_model >= K8_REV_F)
>                          goto ddr3;
>
>                  pvt->dram_type = (pvt->dclr0 & BIT(18)) ? MEM_DDR : MEM_RDDR;
>                  return;
>
>          case 0x10:
>                  if (pvt->dchr0 & DDR3_MODE)
>                          goto ddr3;
>
>                  pvt->dram_type = (pvt->dclr0 & BIT(16)) ? MEM_DDR2 : MEM_RDDR2;
>                  return;
>
>          case 0x15:
>                  if (pvt->model < 0x60)
>                          goto ddr3;
>
>                  /*
>                   * Model 0x60h needs special handling:
>                   *
>                   * We use a Chip Select value of '0' to obtain dcsm.
>                   * Theoretically, it is possible to populate LRDIMMs of different
>                   * 'Rank' value on a DCT. But this is not the common case. So,
>                   * it's reasonable to assume all DIMMs are going to be of same
>                   * 'type' until proven otherwise.
>                   */
>                  amd64_read_dct_pci_cfg(pvt, 0, DRAM_CONTROL, &dram_ctrl);
>                  dcsm = pvt->csels[0].csmasks[0];
>
>                  if (((dram_ctrl >> 8) & 0x7) == 0x2)
>                          pvt->dram_type = MEM_DDR4;
>                  else if (pvt->dclr0 & BIT(16))
>                          pvt->dram_type = MEM_DDR3;
>                  else if (dcsm & 0x3)
>                          pvt->dram_type = MEM_LRDDR3;
>                  else
>                          pvt->dram_type = MEM_RDDR3;
>
>                  return;
>
>          case 0x16:
>                  goto ddr3;
>
>          default:
>                  WARN(1, KERN_ERR "%s: Family??? 0x%x\n", __func__, pvt->fam);
>                  pvt->dram_type = MEM_EMPTY;
>          }
>          return;
>
> ddr3:
>          pvt->dram_type = (pvt->dclr0 & BIT(16)) ? MEM_DDR3 : MEM_RDDR3;
> }

Ok, This does looks better, thanks :)