Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)

2 files changed, 45 insertions, 26 deletions

diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
index 05523b504271..76d1f576cdc8 100644
--- a/drivers/edac/i7300_edac.c
+++ b/drivers/edac/i7300_edac.c
@@ -162,7 +162,7 @@ static struct edac_pci_ctl_info *i7300_pci;
 #define AMBPRESENT_0    0x64
 #define AMBPRESENT_1    0x66
 
-const static u16 mtr_regs[MAX_SLOTS] = {
+static const u16 mtr_regs[MAX_SLOTS] = {
         0x80, 0x84, 0x88, 0x8c,
         0x82, 0x86, 0x8a, 0x8e
 };
diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
index 3218819b7286..92e65e7038e9 100644
--- a/drivers/edac/i82975x_edac.c
+++ b/drivers/edac/i82975x_edac.c
@@ -160,8 +160,8 @@ NOTE: Only ONE of the three must be enabled
                                          * 3:2  Rank 1 architecture
                                          * 1:0  Rank 0 architecture
                                          *
-                                         * 00 => x16 devices; i.e 4 banks
-                                         * 01 => x8  devices; i.e 8 banks
+                                         * 00 => 4 banks
+                                         * 01 => 8 banks
                                          */
 #define I82975X_C0BNKARC        0x10e
 #define I82975X_C1BNKARC        0x18e
@@ -278,6 +278,7 @@ static int i82975x_process_error_info(struct mem_ctl_info *mci,
                 struct i82975x_error_info *info, int handle_errors)
 {
         int row, multi_chan, chan;
+        unsigned long offst, page;
 
         multi_chan = mci->csrows[0].nr_channels - 1;
 
@@ -292,17 +293,19 @@ static int i82975x_process_error_info(struct mem_ctl_info *mci,
                 info->errsts = info->errsts2;
         }
 
-        chan = info->eap & 1;
-        info->eap >>= 1;
-        if (info->xeap )
-                info->eap |= 0x80000000;
-        info->eap >>= PAGE_SHIFT;
-        row = edac_mc_find_csrow_by_page(mci, info->eap);
+        page = (unsigned long) info->eap;
+        if (info->xeap & 1)
+                page |= 0x100000000ul;
+        chan = page & 1;
+        page >>= 1;
+        offst = page & ((1 << PAGE_SHIFT) - 1);
+        page >>= PAGE_SHIFT;
+        row = edac_mc_find_csrow_by_page(mci, page);
 
         if (info->errsts & 0x0002)
-                edac_mc_handle_ue(mci, info->eap, 0, row, "i82975x UE");
+                edac_mc_handle_ue(mci, page, offst , row, "i82975x UE");
         else
-                edac_mc_handle_ce(mci, info->eap, 0, info->derrsyn, row,
+                edac_mc_handle_ce(mci, page, offst, info->derrsyn, row,
                                 multi_chan ? chan : 0,
                                 "i82975x CE");
 
@@ -344,11 +347,7 @@ static int dual_channel_active(void __iomem *mch_window)
 static enum dev_type i82975x_dram_type(void __iomem *mch_window, int rank)
 {
         /*
-         * ASUS P5W DH either does not program this register or programs
-         * it wrong!
-         * ECC is possible on i92975x ONLY with DEV_X8 which should mean 'val'
-         * for each rank should be 01b - the LSB of the word should be 0x55;
-         * but it reads 0!
+         * ECC is possible on i92975x ONLY with DEV_X8
          */
         return DEV_X8;
 }
@@ -356,11 +355,15 @@ static enum dev_type i82975x_dram_type(void __iomem *mch_window, int rank)
 static void i82975x_init_csrows(struct mem_ctl_info *mci,
                 struct pci_dev *pdev, void __iomem *mch_window)
 {
+        static const char *labels[4] = {
+                                                        "DIMM A1", "DIMM A2",
+                                                        "DIMM B1", "DIMM B2"
+                                                };
         struct csrow_info *csrow;
         unsigned long last_cumul_size;
         u8 value;
         u32 cumul_size;
-        int index;
+        int index, chan;
 
         last_cumul_size = 0;
 
@@ -369,11 +372,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
          * The dram row boundary (DRB) reg values are boundary address
          * for each DRAM row with a granularity of 32 or 64MB (single/dual
          * channel operation).  DRB regs are cumulative; therefore DRB7 will
-         * contain the total memory contained in all eight rows.
-         *
-         * FIXME:
-         *  EDAC currently works for Dual-channel Interleaved configuration.
-         *  Other configurations, which the chip supports, need fixing/testing.
+         * contain the total memory contained in all rows.
          *
          */
 
@@ -384,8 +383,26 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
                                         ((index >= 4) ? 0x80 : 0));
                 cumul_size = value;
                 cumul_size <<= (I82975X_DRB_SHIFT - PAGE_SHIFT);
+                /*
+                 * Adjust cumul_size w.r.t number of channels
+                 *
+                 */
+                if (csrow->nr_channels > 1)
+                        cumul_size <<= 1;
                 debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,
                         cumul_size);
+
+                /*
+                 * Initialise dram labels
+                 * index values:
+                 *   [0-7] for single-channel; i.e. csrow->nr_channels = 1
+                 *   [0-3] for dual-channel; i.e. csrow->nr_channels = 2
+                 */
+                for (chan = 0; chan < csrow->nr_channels; chan++)
+                        strncpy(csrow->channels[chan].label,
+                                        labels[(index >> 1) + (chan * 2)],
+                                        EDAC_MC_LABEL_LEN);
+
                 if (cumul_size == last_cumul_size)
                         continue;       /* not populated */
 
@@ -393,8 +410,8 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
                 csrow->last_page = cumul_size - 1;
                 csrow->nr_pages = cumul_size - last_cumul_size;
                 last_cumul_size = cumul_size;
-                csrow->grain = 1 << 7;  /* I82975X_EAP has 128B resolution */
-                csrow->mtype = MEM_DDR; /* i82975x supports only DDR2 */
+                csrow->grain = 1 << 6;  /* I82975X_EAP has 64B resolution */
+                csrow->mtype = MEM_DDR2; /* I82975x supports only DDR2 */
                 csrow->dtype = i82975x_dram_type(mch_window, index);
                 csrow->edac_mode = EDAC_SECDED; /* only supported */
         }
@@ -515,18 +532,20 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
 
         debugf3("%s(): init mci\n", __func__);
         mci->dev = &pdev->dev;
-        mci->mtype_cap = MEM_FLAG_DDR;
+        mci->mtype_cap = MEM_FLAG_DDR2;
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
         mci->edac_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
         mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = I82975X_REVISION;
         mci->ctl_name = i82975x_devs[dev_idx].ctl_name;
+        mci->dev_name = pci_name(pdev);
         mci->edac_check = i82975x_check;
         mci->ctl_page_to_phys = NULL;
         debugf3("%s(): init pvt\n", __func__);
         pvt = (struct i82975x_pvt *) mci->pvt_info;
         pvt->mch_window = mch_window;
         i82975x_init_csrows(mci, pdev, mch_window);
+        mci->scrub_mode = SCRUB_HW_SRC;
         i82975x_get_error_info(mci, &discard);  /* clear counters */
 
         /* finalize this instance of memory controller with edac core */
@@ -664,7 +683,7 @@ module_init(i82975x_init);
 module_exit(i82975x_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Arvind R. <arvind@acarlab.com>");
+MODULE_AUTHOR("Arvind R. <arvino55@gmail.com>");
 MODULE_DESCRIPTION("MC support for Intel 82975 memory hub controllers");
 
 module_param(edac_op_state, int, 0444);