[PATCH 03/12] sb_edac: isolate TOLM retrieval

[Aristeu Rozanski]

This is in preparation for the Ivy Bridge support.

Signed-off-by: Aristeu Rozanski <aroza...@redhat.com>
---
 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 466c313..3e4837f 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -256,9 +256,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 {
@@ -442,6 +444,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, &reg);
+       return GET_TOLM(reg);
+}
+
 /****************************************************************************
                        Memory check routines
  ****************************************************************************/
@@ -616,10 +627,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,
-                             &reg);
-       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);
@@ -1644,6 +1652,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;
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/