提交 fb79a509 编写于 作者: A Aristeu Rozanski 提交者: Mauro Carvalho Chehab

sb_edac: isolate TOLM retrieval

This is in preparation for the Ivy Bridge support.
Signed-off-by: NAristeu Rozanski <arozansk@redhat.com>
Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
上级 ef1e8d03
...@@ -273,9 +273,11 @@ static const u32 correrrthrsld[] = { ...@@ -273,9 +273,11 @@ static const u32 correrrthrsld[] = {
#define NUM_CHANNELS 4 #define NUM_CHANNELS 4
#define MAX_DIMMS 3 /* Max DIMMS per channel */ #define MAX_DIMMS 3 /* Max DIMMS per channel */
struct sbridge_pvt;
struct sbridge_info { struct sbridge_info {
u32 mcmtr; u32 mcmtr;
u32 rankcfgr; u32 rankcfgr;
u64 (*get_tolm)(struct sbridge_pvt *pvt);
}; };
struct sbridge_channel { struct sbridge_channel {
...@@ -459,6 +461,15 @@ static void free_sbridge_dev(struct sbridge_dev *sbridge_dev) ...@@ -459,6 +461,15 @@ static void free_sbridge_dev(struct sbridge_dev *sbridge_dev)
kfree(sbridge_dev); kfree(sbridge_dev);
} }
static u64 sbridge_get_tolm(struct sbridge_pvt *pvt)
{
u32 reg;
/* Address range is 32:28 */
pci_read_config_dword(pvt->pci_sad1, TOLM, &reg);
return GET_TOLM(reg);
}
/**************************************************************************** /****************************************************************************
Memory check routines Memory check routines
****************************************************************************/ ****************************************************************************/
...@@ -633,10 +644,7 @@ static void get_memory_layout(const struct mem_ctl_info *mci) ...@@ -633,10 +644,7 @@ static void get_memory_layout(const struct mem_ctl_info *mci)
* Step 1) Get TOLM/TOHM ranges * Step 1) Get TOLM/TOHM ranges
*/ */
/* Address range is 32:28 */ pvt->tolm = pvt->info.get_tolm(pvt);
pci_read_config_dword(pvt->pci_sad1, TOLM,
&reg);
pvt->tolm = GET_TOLM(reg);
tmp_mb = (1 + pvt->tolm) >> 20; tmp_mb = (1 + pvt->tolm) >> 20;
mb = div_u64_rem(tmp_mb, 1000, &kb); mb = div_u64_rem(tmp_mb, 1000, &kb);
...@@ -1661,6 +1669,7 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev) ...@@ -1661,6 +1669,7 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
mci->ctl_name = kasprintf(GFP_KERNEL, "Sandy Bridge Socket#%d", mci->mc_idx); mci->ctl_name = kasprintf(GFP_KERNEL, "Sandy Bridge Socket#%d", mci->mc_idx);
mci->dev_name = pci_name(sbridge_dev->pdev[0]); mci->dev_name = pci_name(sbridge_dev->pdev[0]);
mci->ctl_page_to_phys = NULL; mci->ctl_page_to_phys = NULL;
pvt->info.get_tolm = sbridge_get_tolm;
/* Set the function pointer to an actual operation function */ /* Set the function pointer to an actual operation function */
mci->edac_check = sbridge_check_error; mci->edac_check = sbridge_check_error;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册