dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 06:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

ddr: altera: sdram: Clean up sdram_calculate_size() part 2

Browse Source 
Clean up coding style, mostly clean up comments, add kerneldoc.
Also, zap assignment of the "cs" variable, which is outright
dead code, so just remove it.

Signed-off-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Marek Vasut
2015-08-01 21:47:16 +02:00
parent bb056d9c07
commit f97606f237
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/ddr/altera/sdram.c
View File

@@ -451,14 +451,11 @@ int sdram_mmr_init_full(unsigned int sdr_phy_reg)
return status; return status;
} }
/* /**
* To calculate SDRAM device size based on SDRAM controller parameters. * sdram_calculate_size() - Calculate SDRAM size
* Size is specified in bytes.
* *
* NOTE: * Calculate SDRAM device size based on SDRAM controller parameters.
* This function is compiled and linked into the preloader and * Size is specified in bytes.
* Uboot (there may be others). So if this function changes, the Preloader
* and UBoot must be updated simultaneously.
*/ */
unsigned long sdram_calculate_size(void) unsigned long sdram_calculate_size(void)
{ {
@@ -476,23 +473,17 @@ unsigned long sdram_calculate_size(void)
col = (temp & SDR_CTRLGRP_DRAMADDRW_COLBITS_MASK) >> col = (temp & SDR_CTRLGRP_DRAMADDRW_COLBITS_MASK) >>
SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB; SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB;
/* SDRAM Failure When Accessing Non-Existent Memory /*
* SDRAM Failure When Accessing Non-Existent Memory
* Use ROWBITS from Quartus/QSys to calculate SDRAM size * Use ROWBITS from Quartus/QSys to calculate SDRAM size
* since the FB specifies we modify ROWBITs to work around SDRAM * since the FB specifies we modify ROWBITs to work around SDRAM
* controller issue. * controller issue.
*
* If the stored handoff value for rows is 0, it probably means
* the preloader is older than UBoot. Use the
* #define from the SOCEDS Tools per Crucible review
* uboot-socfpga-204. Note that this is not a supported
* configuration and is not tested. The customer
* should be using preloader and uboot built from the
* same tag.
*/ */
row = readl(&sysmgr_regs->iswgrp_handoff[4]); row = readl(&sysmgr_regs->iswgrp_handoff[4]);
if (row == 0) if (row == 0)
row = rowbits; row = rowbits;
/* If the stored handoff value for rows is greater than /*
* If the stored handoff value for rows is greater than
* the field width in the sdr.dramaddrw register then * the field width in the sdr.dramaddrw register then
* something is very wrong. Revert to using the the #define * something is very wrong. Revert to using the the #define
* value handed off by the SOCEDS tool chain instead of * value handed off by the SOCEDS tool chain instead of
@@ -504,18 +495,16 @@ unsigned long sdram_calculate_size(void)
bank = (temp & SDR_CTRLGRP_DRAMADDRW_BANKBITS_MASK) >> bank = (temp & SDR_CTRLGRP_DRAMADDRW_BANKBITS_MASK) >>
SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB; SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB;
/* SDRAM Failure When Accessing Non-Existent Memory /*
* SDRAM Failure When Accessing Non-Existent Memory
* Use CSBITs from Quartus/QSys to calculate SDRAM size * Use CSBITs from Quartus/QSys to calculate SDRAM size
* since the FB specifies we modify CSBITs to work around SDRAM * since the FB specifies we modify CSBITs to work around SDRAM
* controller issue. * controller issue.
*/ */
cs = (temp & SDR_CTRLGRP_DRAMADDRW_CSBITS_MASK) >>
SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB;
cs += 1;
cs = csbits; cs = csbits;
width = readl(&sdr_ctrl->dram_if_width); width = readl(&sdr_ctrl->dram_if_width);
/* ECC would not be calculated as its not addressible */ /* ECC would not be calculated as its not addressible */
if (width == SDRAM_WIDTH_32BIT_WITH_ECC) if (width == SDRAM_WIDTH_32BIT_WITH_ECC)
width = 32; width = 32;
@@ -526,7 +515,7 @@ unsigned long sdram_calculate_size(void)
temp = 1 << (row + bank + col); temp = 1 << (row + bank + col);
temp = temp * cs * (width / 8); temp = temp * cs * (width / 8);
debug("sdram_calculate_memory returns %ld\n", temp); debug("%s returns %ld\n", __func__, temp);
return temp; return temp;
} }