Merge tag 'for-3.10-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[karo-tx-linux.git] / drivers / edac / amd64_edac.c

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index e1d13c463c9094e4f1b996311b1767725619f90f..8b6a0343c2208121cf858c6a22aea1816f427f16 100644 (file)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -98,6 +98,7 @@ int __amd64_write_pci_cfg_dword(struct pci_dev *pdev, int offset,
  *
  * F15h: we select which DCT we access using F1x10C[DctCfgSel]
  *
+ * F16h: has only 1 DCT
  */
 static int k8_read_dct_pci_cfg(struct amd64_pvt *pvt, int addr, u32 *val,
                               const char *func)
@@ -340,6 +341,27 @@ static void get_cs_base_and_mask(struct amd64_pvt *pvt, int csrow, u8 dct,
                base_bits       = GENMASK(21, 31) | GENMASK(9, 15);
                mask_bits       = GENMASK(21, 29) | GENMASK(9, 15);
                addr_shift      = 4;
+
+       /*
+       * F16h needs two addr_shift values: 8 for high and 6 for low
+       * (cf. F16h BKDG).
+       */
+       } else if (boot_cpu_data.x86 == 0x16) {
+               csbase          = pvt->csels[dct].csbases[csrow];
+               csmask          = pvt->csels[dct].csmasks[csrow >> 1];
+
+               *base  = (csbase & GENMASK(5,  15)) << 6;
+               *base |= (csbase & GENMASK(19, 30)) << 8;
+
+               *mask = ~0ULL;
+               /* poke holes for the csmask */
+               *mask &= ~((GENMASK(5, 15)  << 6) |
+                          (GENMASK(19, 30) << 8));
+
+               *mask |= (csmask & GENMASK(5, 15))  << 6;
+               *mask |= (csmask & GENMASK(19, 30)) << 8;
+
+               return;
        } else {
                csbase          = pvt->csels[dct].csbases[csrow];
                csmask          = pvt->csels[dct].csmasks[csrow >> 1];
@@ -1150,6 +1172,21 @@ static int f15_dbam_to_chip_select(struct amd64_pvt *pvt, u8 dct,
        return ddr3_cs_size(cs_mode, false);
 }
 
+/*
+ * F16h has only limited cs_modes
+ */
+static int f16_dbam_to_chip_select(struct amd64_pvt *pvt, u8 dct,
+                               unsigned cs_mode)
+{
+       WARN_ON(cs_mode > 12);
+
+       if (cs_mode == 6 || cs_mode == 8 ||
+           cs_mode == 9 || cs_mode == 12)
+               return -1;
+       else
+               return ddr3_cs_size(cs_mode, false);
+}
+
 static void read_dram_ctl_register(struct amd64_pvt *pvt)
 {
 
@@ -1587,6 +1624,17 @@ static struct amd64_family_type amd64_family_types[] = {
                        .read_dct_pci_cfg       = f15_read_dct_pci_cfg,
                }
        },
+       [F16_CPUS] = {
+               .ctl_name = "F16h",
+               .f1_id = PCI_DEVICE_ID_AMD_16H_NB_F1,
+               .f3_id = PCI_DEVICE_ID_AMD_16H_NB_F3,
+               .ops = {
+                       .early_channel_count    = f1x_early_channel_count,
+                       .map_sysaddr_to_csrow   = f1x_map_sysaddr_to_csrow,
+                       .dbam_to_cs             = f16_dbam_to_chip_select,
+                       .read_dct_pci_cfg       = f10_read_dct_pci_cfg,
+               }
+       },
 };
 
 /*
@@ -1939,7 +1987,9 @@ static void read_mc_regs(struct amd64_pvt *pvt)
 
        if (c->x86 >= 0x10) {
                amd64_read_pci_cfg(pvt->F3, EXT_NB_MCA_CFG, &tmp);
-               amd64_read_dct_pci_cfg(pvt, DBAM1, &pvt->dbam1);
+               if (c->x86 != 0x16)
+                       /* F16h has only DCT0 */
+                       amd64_read_dct_pci_cfg(pvt, DBAM1, &pvt->dbam1);
 
                /* F10h, revD and later can do x8 ECC too */
                if ((c->x86 > 0x10 || c->x86_model > 7) && tmp & BIT(25))
@@ -2356,6 +2406,11 @@ static struct amd64_family_type *amd64_per_family_init(struct amd64_pvt *pvt)
                pvt->ops                = &amd64_family_types[F15_CPUS].ops;
                break;
 
+       case 0x16:
+               fam_type                = &amd64_family_types[F16_CPUS];
+               pvt->ops                = &amd64_family_types[F16_CPUS].ops;
+               break;
+
        default:
                amd64_err("Unsupported family!\n");
                return NULL;
@@ -2581,6 +2636,14 @@ static DEFINE_PCI_DEVICE_TABLE(amd64_pci_table) = {
                .class          = 0,
                .class_mask     = 0,
        },
+       {
+               .vendor         = PCI_VENDOR_ID_AMD,
+               .device         = PCI_DEVICE_ID_AMD_16H_NB_F2,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+               .class          = 0,
+               .class_mask     = 0,
+       },
 
        {0, }
 };