diff options
| author | Aristeu Rozanski <arozansk@redhat.com> | 2013-10-30 17:26:57 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-11-14 19:25:27 +0100 |
| commit | fb79a50926b8abadf24ec15e0e61778fa2b7d10b (patch) | |
| tree | 993f5449c4e754634967e78b6f4c4a1db8882ed7 /drivers/edac/sb_edac.c | |
| parent | sb_edac: make RANK_CFG_A value part of sbridge_info (diff) | |
| download | linux-fb79a50926b8abadf24ec15e0e61778fa2b7d10b.tar.xz linux-fb79a50926b8abadf24ec15e0e61778fa2b7d10b.zip | |
sb_edac: isolate TOLM retrieval
This is in preparation for the Ivy Bridge support.
Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/edac/sb_edac.c')
| -rw-r--r-- | drivers/edac/sb_edac.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 3f8c890d79c6..bc434ad5465d 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -273,9 +273,11 @@ static const u32 correrrthrsld[] = { #define NUM_CHANNELS 4 #define MAX_DIMMS 3 /* Max DIMMS per channel */ +struct sbridge_pvt; struct sbridge_info { u32 mcmtr; u32 rankcfgr; + u64 (*get_tolm)(struct sbridge_pvt *pvt); }; struct sbridge_channel { @@ -459,6 +461,15 @@ static void free_sbridge_dev(struct sbridge_dev *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, ®); + return GET_TOLM(reg); +} + /**************************************************************************** Memory check routines ****************************************************************************/ @@ -633,10 +644,7 @@ static void get_memory_layout(const struct mem_ctl_info *mci) * Step 1) Get TOLM/TOHM ranges */ - /* Address range is 32:28 */ - pci_read_config_dword(pvt->pci_sad1, TOLM, - ®); - pvt->tolm = GET_TOLM(reg); + pvt->tolm = pvt->info.get_tolm(pvt); tmp_mb = (1 + pvt->tolm) >> 20; mb = div_u64_rem(tmp_mb, 1000, &kb); @@ -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->dev_name = pci_name(sbridge_dev->pdev[0]); mci->ctl_page_to_phys = NULL; + pvt->info.get_tolm = sbridge_get_tolm; /* Set the function pointer to an actual operation function */ mci->edac_check = sbridge_check_error; |