dany/facetimehd
1
0
Fork 0
mirror of https://github.com/patjak/facetimehd.git synced 2026-04-09 19:10:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

bcwc_pcie: Move memory verification out of ddr code

Browse Source 
Also save the phy ddr registers if test succeeded

Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
This commit is contained in:
Patrik Jakobsson
2015-07-26 00:56:50 +02:00
parent fd2823bc9b
commit 43d62c379e
3 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bcwc_ddr.c
View File

@@ -20,10 +20,7 @@
#include <linux/random.h>
#include "bcwc_drv.h"
#include "bcwc_hw.h"
#define MEM_VERIFY_BASE 0x1000
#define MEM_VERIFY_NUM 128
#define MEM_VERIFY_NUM_FULL (1 * 1024 * 1024)
#include "bcwc_ddr.h"
int bcwc_ddr_verify_mem(struct bcwc_private *dev_priv, u32 base, int count)
{
@@ -668,15 +665,5 @@ int bcwc_ddr_calibrate(struct bcwc_private *dev_priv)
if (ret)
return ret;
ret = bcwc_ddr_verify_mem(dev_priv, 0, MEM_VERIFY_NUM_FULL);
if (ret) {
dev_err(&dev_priv->pdev->dev,
"Full memory verification failed! (%d)\n", ret);
return -EIO;
} else {
dev_info(&dev_priv->pdev->dev,
"Full memory verification succeeded! (%d)\n", ret);
}
return 0;
}

10
bcwc_ddr.h
View File

@@ -17,4 +17,14 @@
*
*/
#ifndef _BCWC_DDR_H
#define _BCWC_DDR_H
#define MEM_VERIFY_BASE 0x0 /* 0x1000000 */
#define MEM_VERIFY_NUM 128
#define MEM_VERIFY_NUM_FULL (1 * 1024 * 1024)
int bcwc_ddr_calibrate(struct bcwc_private *dev_priv);
int bcwc_ddr_verify_mem(struct bcwc_private *dev_priv, u32 base, int count);
#endif

37
bcwc_hw.c
View File

@@ -804,6 +804,7 @@ static int bcwc_hw_power_off(struct bcwc_private *dev_priv)
int bcwc_hw_init(struct bcwc_private *dev_priv)
{
u32 val;
int ret, i;
ret = bcwc_hw_s2_init_pcie_link(dev_priv);
@@ -817,7 +818,41 @@ int bcwc_hw_init(struct bcwc_private *dev_priv)
for (i = 0; i < DDR_PHY_NUM_REGS; i++)
dev_priv->ddr_phy_reg_map[i].offset = ddr_phy_reg_map[i];
bcwc_ddr_calibrate(dev_priv);
dev_info(&dev_priv->pdev->dev,
"Dumping DDR PHY reg map before shmoo\n");
for (i = 0; i < DDR_PHY_NUM_REGS; i++) {
if (!(i % 3) && i > 0)
printk("\n");
val = BCWC_S2_REG_READ(ddr_phy_reg_map[i]);
printk(KERN_CONT "0x%.3x = 0x%.8x\t",
ddr_phy_reg_map[i], val);
}
ret = bcwc_ddr_verify_mem(dev_priv, 0, MEM_VERIFY_NUM_FULL);
if (ret) {
dev_err(&dev_priv->pdev->dev,
"Full memory verification failed! (%d)\n", ret);
/*
* Here we should do a shmoo calibration but it's not yet
* fully implemented.
*/
/* bcwc_ddr_calibrate(dev_priv); */
} else {
dev_info(&dev_priv->pdev->dev,
"Full memory verification succeeded! (%d)\n", ret);
}
/* Save our working configuration */
bcwc_hw_ddr_phy_save_regs(dev_priv);
BCWC_S2_REG_WRITE(0x8, S2_D108);
BCWC_S2_REG_WRITE(0xc, S2_D104);
BCWC_ISP_REG_WRITE(0, ISP_REG_40004);
out:
return ret;
}