diff options
| author | Aristeu Rozanski <arozansk@redhat.com> | 2013-10-30 13:26:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-11-14 16:43:17 -0200 |
| commit | 8fd6a43ac9300c2451823f390c0301770973bc36 (patch) | |
| tree | cbdccb7671828fd07ed304daf6224c805c52ba02 /drivers/edac | |
| parent | 5f8a1b8a7b55937842c1c6b03c002134aacd7393 (diff) | |
| download | linux-stable-8fd6a43ac9300c2451823f390c0301770973bc36.tar.gz linux-stable-8fd6a43ac9300c2451823f390c0301770973bc36.tar.bz2 linux-stable-8fd6a43ac9300c2451823f390c0301770973bc36.zip | |
sb_edac: isolate TOHM retrieval
This is preparation of 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')
| -rw-r--r-- | drivers/edac/sb_edac.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index cc4fe466236e..4ec4957b484c 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -278,6 +278,7 @@ struct sbridge_info { u32 mcmtr; u32 rankcfgr; u64 (*get_tolm)(struct sbridge_pvt *pvt); + u64 (*get_tohm)(struct sbridge_pvt *pvt); }; struct sbridge_channel { @@ -470,6 +471,14 @@ static u64 sbridge_get_tolm(struct sbridge_pvt *pvt) return GET_TOLM(reg); } +static u64 sbridge_get_tohm(struct sbridge_pvt *pvt) +{ + u32 reg; + + pci_read_config_dword(pvt->pci_sad1, TOHM, ®); + return GET_TOHM(reg); +} + /**************************************************************************** Memory check routines ****************************************************************************/ @@ -651,9 +660,7 @@ static void get_memory_layout(const struct mem_ctl_info *mci) edac_dbg(0, "TOLM: %u.%03u GB (0x%016Lx)\n", mb, kb, (u64)pvt->tolm); /* Address range is already 45:25 */ - pci_read_config_dword(pvt->pci_sad1, TOHM, - ®); - pvt->tohm = GET_TOHM(reg); + pvt->tohm = pvt->info.get_tohm(pvt); tmp_mb = (1 + pvt->tohm) >> 20; mb = div_u64_rem(tmp_mb, 1000, &kb); @@ -1670,6 +1677,7 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev) mci->dev_name = pci_name(sbridge_dev->pdev[0]); mci->ctl_page_to_phys = NULL; pvt->info.get_tolm = sbridge_get_tolm; + pvt->info.get_tohm = sbridge_get_tohm; /* Set the function pointer to an actual operation function */ mci->edac_check = sbridge_check_error; |