2009-09-23 16:57:27 -06:00
|
|
|
/*
|
|
|
|
* Intel 3200/3210 Memory Controller kernel module
|
|
|
|
* Copyright (C) 2008-2009 Akamai Technologies, Inc.
|
|
|
|
* Portions by Hitoshi Mitake <h.mitake@gmail.com>.
|
|
|
|
*
|
|
|
|
* This file may be distributed under the terms of the
|
|
|
|
* GNU General Public License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/pci.h>
|
|
|
|
#include <linux/pci_ids.h>
|
|
|
|
#include <linux/edac.h>
|
|
|
|
#include <linux/io.h>
|
2016-10-29 11:16:34 -06:00
|
|
|
#include "edac_module.h"
|
2009-09-23 16:57:27 -06:00
|
|
|
|
2015-08-28 01:27:14 -06:00
|
|
|
#include <linux/io-64-nonatomic-lo-hi.h>
|
2012-02-06 19:45:33 -07:00
|
|
|
|
2009-09-23 16:57:27 -06:00
|
|
|
#define EDAC_MOD_STR "i3200_edac"
|
|
|
|
|
|
|
|
#define PCI_DEVICE_ID_INTEL_3200_HB 0x29f0
|
|
|
|
|
2012-04-16 12:09:38 -06:00
|
|
|
#define I3200_DIMMS 4
|
2009-09-23 16:57:27 -06:00
|
|
|
#define I3200_RANKS 8
|
|
|
|
#define I3200_RANKS_PER_CHANNEL 4
|
|
|
|
#define I3200_CHANNELS 2
|
|
|
|
|
|
|
|
/* Intel 3200 register addresses - device 0 function 0 - DRAM Controller */
|
|
|
|
|
|
|
|
#define I3200_MCHBAR_LOW 0x48 /* MCH Memory Mapped Register BAR */
|
|
|
|
#define I3200_MCHBAR_HIGH 0x4c
|
|
|
|
#define I3200_MCHBAR_MASK 0xfffffc000ULL /* bits 35:14 */
|
|
|
|
#define I3200_MMR_WINDOW_SIZE 16384
|
|
|
|
|
|
|
|
#define I3200_TOM 0xa0 /* Top of Memory (16b)
|
|
|
|
*
|
|
|
|
* 15:10 reserved
|
|
|
|
* 9:0 total populated physical memory
|
|
|
|
*/
|
|
|
|
#define I3200_TOM_MASK 0x3ff /* bits 9:0 */
|
|
|
|
#define I3200_TOM_SHIFT 26 /* 64MiB grain */
|
|
|
|
|
|
|
|
#define I3200_ERRSTS 0xc8 /* Error Status Register (16b)
|
|
|
|
*
|
|
|
|
* 15 reserved
|
|
|
|
* 14 Isochronous TBWRR Run Behind FIFO Full
|
|
|
|
* (ITCV)
|
|
|
|
* 13 Isochronous TBWRR Run Behind FIFO Put
|
|
|
|
* (ITSTV)
|
|
|
|
* 12 reserved
|
|
|
|
* 11 MCH Thermal Sensor Event
|
|
|
|
* for SMI/SCI/SERR (GTSE)
|
|
|
|
* 10 reserved
|
|
|
|
* 9 LOCK to non-DRAM Memory Flag (LCKF)
|
|
|
|
* 8 reserved
|
|
|
|
* 7 DRAM Throttle Flag (DTF)
|
|
|
|
* 6:2 reserved
|
|
|
|
* 1 Multi-bit DRAM ECC Error Flag (DMERR)
|
|
|
|
* 0 Single-bit DRAM ECC Error Flag (DSERR)
|
|
|
|
*/
|
|
|
|
#define I3200_ERRSTS_UE 0x0002
|
|
|
|
#define I3200_ERRSTS_CE 0x0001
|
|
|
|
#define I3200_ERRSTS_BITS (I3200_ERRSTS_UE | I3200_ERRSTS_CE)
|
|
|
|
|
|
|
|
|
|
|
|
/* Intel MMIO register space - device 0 function 0 - MMR space */
|
|
|
|
|
|
|
|
#define I3200_C0DRB 0x200 /* Channel 0 DRAM Rank Boundary (16b x 4)
|
|
|
|
*
|
|
|
|
* 15:10 reserved
|
|
|
|
* 9:0 Channel 0 DRAM Rank Boundary Address
|
|
|
|
*/
|
|
|
|
#define I3200_C1DRB 0x600 /* Channel 1 DRAM Rank Boundary (16b x 4) */
|
|
|
|
#define I3200_DRB_MASK 0x3ff /* bits 9:0 */
|
|
|
|
#define I3200_DRB_SHIFT 26 /* 64MiB grain */
|
|
|
|
|
|
|
|
#define I3200_C0ECCERRLOG 0x280 /* Channel 0 ECC Error Log (64b)
|
|
|
|
*
|
|
|
|
* 63:48 Error Column Address (ERRCOL)
|
|
|
|
* 47:32 Error Row Address (ERRROW)
|
|
|
|
* 31:29 Error Bank Address (ERRBANK)
|
|
|
|
* 28:27 Error Rank Address (ERRRANK)
|
|
|
|
* 26:24 reserved
|
|
|
|
* 23:16 Error Syndrome (ERRSYND)
|
|
|
|
* 15: 2 reserved
|
|
|
|
* 1 Multiple Bit Error Status (MERRSTS)
|
|
|
|
* 0 Correctable Error Status (CERRSTS)
|
|
|
|
*/
|
|
|
|
#define I3200_C1ECCERRLOG 0x680 /* Chan 1 ECC Error Log (64b) */
|
|
|
|
#define I3200_ECCERRLOG_CE 0x1
|
|
|
|
#define I3200_ECCERRLOG_UE 0x2
|
|
|
|
#define I3200_ECCERRLOG_RANK_BITS 0x18000000
|
|
|
|
#define I3200_ECCERRLOG_RANK_SHIFT 27
|
|
|
|
#define I3200_ECCERRLOG_SYNDROME_BITS 0xff0000
|
|
|
|
#define I3200_ECCERRLOG_SYNDROME_SHIFT 16
|
|
|
|
#define I3200_CAPID0 0xe0 /* P.95 of spec for details */
|
|
|
|
|
|
|
|
struct i3200_priv {
|
|
|
|
void __iomem *window;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int nr_channels;
|
|
|
|
|
|
|
|
static int how_many_channels(struct pci_dev *pdev)
|
|
|
|
{
|
2013-01-10 09:31:43 -07:00
|
|
|
int n_channels;
|
|
|
|
|
2009-09-23 16:57:27 -06:00
|
|
|
unsigned char capid0_8b; /* 8th byte of CAPID0 */
|
|
|
|
|
|
|
|
pci_read_config_byte(pdev, I3200_CAPID0 + 8, &capid0_8b);
|
2013-01-10 09:31:43 -07:00
|
|
|
|
2009-09-23 16:57:27 -06:00
|
|
|
if (capid0_8b & 0x20) { /* check DCD: Dual Channel Disable */
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(0, "In single channel mode\n");
|
2013-01-10 09:31:43 -07:00
|
|
|
n_channels = 1;
|
2009-09-23 16:57:27 -06:00
|
|
|
} else {
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(0, "In dual channel mode\n");
|
2013-01-10 09:31:43 -07:00
|
|
|
n_channels = 2;
|
2009-09-23 16:57:27 -06:00
|
|
|
}
|
2013-01-10 09:31:43 -07:00
|
|
|
|
|
|
|
if (capid0_8b & 0x10) /* check if both channels are filled */
|
|
|
|
edac_dbg(0, "2 DIMMS per channel disabled\n");
|
|
|
|
else
|
|
|
|
edac_dbg(0, "2 DIMMS per channel enabled\n");
|
|
|
|
|
|
|
|
return n_channels;
|
2009-09-23 16:57:27 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long eccerrlog_syndrome(u64 log)
|
|
|
|
{
|
|
|
|
return (log & I3200_ECCERRLOG_SYNDROME_BITS) >>
|
|
|
|
I3200_ECCERRLOG_SYNDROME_SHIFT;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int eccerrlog_row(int channel, u64 log)
|
|
|
|
{
|
|
|
|
u64 rank = ((log & I3200_ECCERRLOG_RANK_BITS) >>
|
|
|
|
I3200_ECCERRLOG_RANK_SHIFT);
|
|
|
|
return rank | (channel * I3200_RANKS_PER_CHANNEL);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum i3200_chips {
|
|
|
|
I3200 = 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct i3200_dev_info {
|
|
|
|
const char *ctl_name;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct i3200_error_info {
|
|
|
|
u16 errsts;
|
|
|
|
u16 errsts2;
|
|
|
|
u64 eccerrlog[I3200_CHANNELS];
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct i3200_dev_info i3200_devs[] = {
|
|
|
|
[I3200] = {
|
|
|
|
.ctl_name = "i3200"
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct pci_dev *mci_pdev;
|
|
|
|
static int i3200_registered = 1;
|
|
|
|
|
|
|
|
|
|
|
|
static void i3200_clear_error_info(struct mem_ctl_info *mci)
|
|
|
|
{
|
|
|
|
struct pci_dev *pdev;
|
|
|
|
|
2012-03-16 04:44:18 -06:00
|
|
|
pdev = to_pci_dev(mci->pdev);
|
2009-09-23 16:57:27 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Clear any error bits.
|
|
|
|
* (Yes, we really clear bits by writing 1 to them.)
|
|
|
|
*/
|
|
|
|
pci_write_bits16(pdev, I3200_ERRSTS, I3200_ERRSTS_BITS,
|
|
|
|
I3200_ERRSTS_BITS);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void i3200_get_and_clear_error_info(struct mem_ctl_info *mci,
|
|
|
|
struct i3200_error_info *info)
|
|
|
|
{
|
|
|
|
struct pci_dev *pdev;
|
|
|
|
struct i3200_priv *priv = mci->pvt_info;
|
|
|
|
void __iomem *window = priv->window;
|
|
|
|
|
2012-03-16 04:44:18 -06:00
|
|
|
pdev = to_pci_dev(mci->pdev);
|
2009-09-23 16:57:27 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This is a mess because there is no atomic way to read all the
|
|
|
|
* registers at once and the registers can transition from CE being
|
|
|
|
* overwritten by UE.
|
|
|
|
*/
|
|
|
|
pci_read_config_word(pdev, I3200_ERRSTS, &info->errsts);
|
|
|
|
if (!(info->errsts & I3200_ERRSTS_BITS))
|
|
|
|
return;
|
|
|
|
|
|
|
|
info->eccerrlog[0] = readq(window + I3200_C0ECCERRLOG);
|
|
|
|
if (nr_channels == 2)
|
|
|
|
info->eccerrlog[1] = readq(window + I3200_C1ECCERRLOG);
|
|
|
|
|
|
|
|
pci_read_config_word(pdev, I3200_ERRSTS, &info->errsts2);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the error is the same for both reads then the first set
|
|
|
|
* of reads is valid. If there is a change then there is a CE
|
|
|
|
* with no info and the second set of reads is valid and
|
|
|
|
* should be UE info.
|
|
|
|
*/
|
|
|
|
if ((info->errsts ^ info->errsts2) & I3200_ERRSTS_BITS) {
|
|
|
|
info->eccerrlog[0] = readq(window + I3200_C0ECCERRLOG);
|
|
|
|
if (nr_channels == 2)
|
|
|
|
info->eccerrlog[1] = readq(window + I3200_C1ECCERRLOG);
|
|
|
|
}
|
|
|
|
|
|
|
|
i3200_clear_error_info(mci);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void i3200_process_error_info(struct mem_ctl_info *mci,
|
|
|
|
struct i3200_error_info *info)
|
|
|
|
{
|
|
|
|
int channel;
|
|
|
|
u64 log;
|
|
|
|
|
|
|
|
if (!(info->errsts & I3200_ERRSTS_BITS))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if ((info->errsts ^ info->errsts2) & I3200_ERRSTS_BITS) {
|
2012-06-04 10:27:43 -06:00
|
|
|
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, 0, 0, 0,
|
2012-06-04 08:29:25 -06:00
|
|
|
-1, -1, -1, "UE overwrote CE", "");
|
2009-09-23 16:57:27 -06:00
|
|
|
info->errsts = info->errsts2;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (channel = 0; channel < nr_channels; channel++) {
|
|
|
|
log = info->eccerrlog[channel];
|
|
|
|
if (log & I3200_ECCERRLOG_UE) {
|
2012-06-04 10:27:43 -06:00
|
|
|
edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
|
2012-04-16 12:09:38 -06:00
|
|
|
0, 0, 0,
|
|
|
|
eccerrlog_row(channel, log),
|
|
|
|
-1, -1,
|
2012-06-04 08:29:25 -06:00
|
|
|
"i3000 UE", "");
|
2009-09-23 16:57:27 -06:00
|
|
|
} else if (log & I3200_ECCERRLOG_CE) {
|
2014-10-15 14:47:21 -06:00
|
|
|
edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
|
2012-04-16 12:09:38 -06:00
|
|
|
0, 0, eccerrlog_syndrome(log),
|
|
|
|
eccerrlog_row(channel, log),
|
|
|
|
-1, -1,
|
2014-10-15 14:47:21 -06:00
|
|
|
"i3000 CE", "");
|
2009-09-23 16:57:27 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void i3200_check(struct mem_ctl_info *mci)
|
|
|
|
{
|
|
|
|
struct i3200_error_info info;
|
|
|
|
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(1, "MC%d\n", mci->mc_idx);
|
2009-09-23 16:57:27 -06:00
|
|
|
i3200_get_and_clear_error_info(mci, &info);
|
|
|
|
i3200_process_error_info(mci, &info);
|
|
|
|
}
|
|
|
|
|
2013-08-09 03:02:45 -06:00
|
|
|
static void __iomem *i3200_map_mchbar(struct pci_dev *pdev)
|
2009-09-23 16:57:27 -06:00
|
|
|
{
|
|
|
|
union {
|
|
|
|
u64 mchbar;
|
|
|
|
struct {
|
|
|
|
u32 mchbar_low;
|
|
|
|
u32 mchbar_high;
|
|
|
|
};
|
|
|
|
} u;
|
|
|
|
void __iomem *window;
|
|
|
|
|
|
|
|
pci_read_config_dword(pdev, I3200_MCHBAR_LOW, &u.mchbar_low);
|
|
|
|
pci_read_config_dword(pdev, I3200_MCHBAR_HIGH, &u.mchbar_high);
|
|
|
|
u.mchbar &= I3200_MCHBAR_MASK;
|
|
|
|
|
|
|
|
if (u.mchbar != (resource_size_t)u.mchbar) {
|
|
|
|
printk(KERN_ERR
|
|
|
|
"i3200: mmio space beyond accessible range (0x%llx)\n",
|
|
|
|
(unsigned long long)u.mchbar);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-01-06 01:43:50 -07:00
|
|
|
window = ioremap(u.mchbar, I3200_MMR_WINDOW_SIZE);
|
2009-09-23 16:57:27 -06:00
|
|
|
if (!window)
|
|
|
|
printk(KERN_ERR "i3200: cannot map mmio space at 0x%llx\n",
|
|
|
|
(unsigned long long)u.mchbar);
|
|
|
|
|
|
|
|
return window;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void i3200_get_drbs(void __iomem *window,
|
|
|
|
u16 drbs[I3200_CHANNELS][I3200_RANKS_PER_CHANNEL])
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < I3200_RANKS_PER_CHANNEL; i++) {
|
|
|
|
drbs[0][i] = readw(window + I3200_C0DRB + 2*i) & I3200_DRB_MASK;
|
|
|
|
drbs[1][i] = readw(window + I3200_C1DRB + 2*i) & I3200_DRB_MASK;
|
2013-01-10 09:31:43 -07:00
|
|
|
|
|
|
|
edac_dbg(0, "drb[0][%d] = %d, drb[1][%d] = %d\n", i, drbs[0][i], i, drbs[1][i]);
|
2009-09-23 16:57:27 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool i3200_is_stacked(struct pci_dev *pdev,
|
|
|
|
u16 drbs[I3200_CHANNELS][I3200_RANKS_PER_CHANNEL])
|
|
|
|
{
|
|
|
|
u16 tom;
|
|
|
|
|
|
|
|
pci_read_config_word(pdev, I3200_TOM, &tom);
|
|
|
|
tom &= I3200_TOM_MASK;
|
|
|
|
|
|
|
|
return drbs[I3200_CHANNELS - 1][I3200_RANKS_PER_CHANNEL - 1] == tom;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long drb_to_nr_pages(
|
|
|
|
u16 drbs[I3200_CHANNELS][I3200_RANKS_PER_CHANNEL], bool stacked,
|
|
|
|
int channel, int rank)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
n = drbs[channel][rank];
|
i3200_edac: Fix the logic that detects filled memories
After running a series of tests on an HP DL320, filled with different
memory sizes, it was noticed that, when filled with just one DIMM
on such hardware, the driver wrongly detects twice the memory, and
thinks that both channels 0 and 1 are filled.
It seems to be partially caused by the BIOS and partially by the driver.
The i3200_edac current logic would be working fine if the BIOS were
disabling the unused second channel when just one DIMM is connected,
in order to do power-saving, as recommended on this chipset's datasheet.
However, the BIOS on this particular machine doesn't do it:
[ 16.741421] EDAC DEBUG: how_many_channels: In dual channel mode
[ 16.741424] EDAC DEBUG: how_many_channels: 2 DIMMS per channel enabled
So, the driver were assuming that 2 channels are enabled (well, they are,
but the second is unused).
Combined with that, I found two issues at the logic that creates the
EDAC data, that were failing when the two channels are not equally
filled (AFAICT, that happens only when just 1 DIMM is plugged).
The first one is that a 0 at DRB means that nothing is filled. The
driver's logic, however, do some calculation with that.
The second one is that the logic that fills the DIMM data currently
assumes that both channels are equally filled.
I tested the system already with the current configuration and my
patch and it is now working fine. So, for a 2R single DIMM 2Gb memory
at dimm slot 01 (channel 0), it is now displaying:
[ 16.741406] EDAC DEBUG: i3200_get_drbs: drb[0][0] = 16, drb[1][0] = 0
[ 16.741410] EDAC DEBUG: i3200_get_drbs: drb[0][1] = 32, drb[1][1] = 0
[ 16.741413] EDAC DEBUG: i3200_get_drbs: drb[0][2] = 32, drb[1][2] = 0
[ 16.741416] EDAC DEBUG: i3200_get_drbs: drb[0][3] = 32, drb[1][3] = 0
...
[ 16.741896] EDAC DEBUG: i3200_probe1: csrow 0, channel 0, size = 1024 Mb
[ 16.741899] EDAC DEBUG: i3200_probe1: csrow 1, channel 0, size = 1024 Mb
and the corresponding sysfs nodes are now properly filled.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2013-01-10 09:31:47 -07:00
|
|
|
if (!n)
|
|
|
|
return 0;
|
|
|
|
|
2009-09-23 16:57:27 -06:00
|
|
|
if (rank > 0)
|
|
|
|
n -= drbs[channel][rank - 1];
|
|
|
|
if (stacked && (channel == 1) &&
|
|
|
|
drbs[channel][rank] == drbs[channel][I3200_RANKS_PER_CHANNEL - 1])
|
|
|
|
n -= drbs[0][I3200_RANKS_PER_CHANNEL - 1];
|
|
|
|
|
|
|
|
n <<= (I3200_DRB_SHIFT - PAGE_SHIFT);
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
|
|
|
|
{
|
|
|
|
int rc;
|
2012-01-27 14:38:08 -07:00
|
|
|
int i, j;
|
2009-09-23 16:57:27 -06:00
|
|
|
struct mem_ctl_info *mci = NULL;
|
2012-04-16 12:09:38 -06:00
|
|
|
struct edac_mc_layer layers[2];
|
2009-09-23 16:57:27 -06:00
|
|
|
u16 drbs[I3200_CHANNELS][I3200_RANKS_PER_CHANNEL];
|
|
|
|
bool stacked;
|
|
|
|
void __iomem *window;
|
|
|
|
struct i3200_priv *priv;
|
|
|
|
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(0, "MC:\n");
|
2009-09-23 16:57:27 -06:00
|
|
|
|
|
|
|
window = i3200_map_mchbar(pdev);
|
|
|
|
if (!window)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
i3200_get_drbs(window, drbs);
|
|
|
|
nr_channels = how_many_channels(pdev);
|
|
|
|
|
2012-04-16 12:09:38 -06:00
|
|
|
layers[0].type = EDAC_MC_LAYER_CHIP_SELECT;
|
|
|
|
layers[0].size = I3200_DIMMS;
|
|
|
|
layers[0].is_virt_csrow = true;
|
|
|
|
layers[1].type = EDAC_MC_LAYER_CHANNEL;
|
|
|
|
layers[1].size = nr_channels;
|
|
|
|
layers[1].is_virt_csrow = false;
|
2012-05-02 11:37:00 -06:00
|
|
|
mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers,
|
2012-04-16 12:09:38 -06:00
|
|
|
sizeof(struct i3200_priv));
|
2009-09-23 16:57:27 -06:00
|
|
|
if (!mci)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(3, "MC: init mci\n");
|
2009-09-23 16:57:27 -06:00
|
|
|
|
2012-03-16 04:44:18 -06:00
|
|
|
mci->pdev = &pdev->dev;
|
2009-09-23 16:57:27 -06:00
|
|
|
mci->mtype_cap = MEM_FLAG_DDR2;
|
|
|
|
|
|
|
|
mci->edac_ctl_cap = EDAC_FLAG_SECDED;
|
|
|
|
mci->edac_cap = EDAC_FLAG_SECDED;
|
|
|
|
|
|
|
|
mci->mod_name = EDAC_MOD_STR;
|
|
|
|
mci->ctl_name = i3200_devs[dev_idx].ctl_name;
|
|
|
|
mci->dev_name = pci_name(pdev);
|
|
|
|
mci->edac_check = i3200_check;
|
|
|
|
mci->ctl_page_to_phys = NULL;
|
|
|
|
priv = mci->pvt_info;
|
|
|
|
priv->window = window;
|
|
|
|
|
|
|
|
stacked = i3200_is_stacked(pdev, drbs);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The dram rank boundary (DRB) reg values are boundary addresses
|
|
|
|
* for each DRAM rank with a granularity of 64MB. DRB regs are
|
|
|
|
* cumulative; the last one will contain the total memory
|
|
|
|
* contained in all ranks.
|
|
|
|
*/
|
i3200_edac: Fix the logic that detects filled memories
After running a series of tests on an HP DL320, filled with different
memory sizes, it was noticed that, when filled with just one DIMM
on such hardware, the driver wrongly detects twice the memory, and
thinks that both channels 0 and 1 are filled.
It seems to be partially caused by the BIOS and partially by the driver.
The i3200_edac current logic would be working fine if the BIOS were
disabling the unused second channel when just one DIMM is connected,
in order to do power-saving, as recommended on this chipset's datasheet.
However, the BIOS on this particular machine doesn't do it:
[ 16.741421] EDAC DEBUG: how_many_channels: In dual channel mode
[ 16.741424] EDAC DEBUG: how_many_channels: 2 DIMMS per channel enabled
So, the driver were assuming that 2 channels are enabled (well, they are,
but the second is unused).
Combined with that, I found two issues at the logic that creates the
EDAC data, that were failing when the two channels are not equally
filled (AFAICT, that happens only when just 1 DIMM is plugged).
The first one is that a 0 at DRB means that nothing is filled. The
driver's logic, however, do some calculation with that.
The second one is that the logic that fills the DIMM data currently
assumes that both channels are equally filled.
I tested the system already with the current configuration and my
patch and it is now working fine. So, for a 2R single DIMM 2Gb memory
at dimm slot 01 (channel 0), it is now displaying:
[ 16.741406] EDAC DEBUG: i3200_get_drbs: drb[0][0] = 16, drb[1][0] = 0
[ 16.741410] EDAC DEBUG: i3200_get_drbs: drb[0][1] = 32, drb[1][1] = 0
[ 16.741413] EDAC DEBUG: i3200_get_drbs: drb[0][2] = 32, drb[1][2] = 0
[ 16.741416] EDAC DEBUG: i3200_get_drbs: drb[0][3] = 32, drb[1][3] = 0
...
[ 16.741896] EDAC DEBUG: i3200_probe1: csrow 0, channel 0, size = 1024 Mb
[ 16.741899] EDAC DEBUG: i3200_probe1: csrow 1, channel 0, size = 1024 Mb
and the corresponding sysfs nodes are now properly filled.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2013-01-10 09:31:47 -07:00
|
|
|
for (i = 0; i < I3200_DIMMS; i++) {
|
2009-09-23 16:57:27 -06:00
|
|
|
unsigned long nr_pages;
|
|
|
|
|
i3200_edac: Fix the logic that detects filled memories
After running a series of tests on an HP DL320, filled with different
memory sizes, it was noticed that, when filled with just one DIMM
on such hardware, the driver wrongly detects twice the memory, and
thinks that both channels 0 and 1 are filled.
It seems to be partially caused by the BIOS and partially by the driver.
The i3200_edac current logic would be working fine if the BIOS were
disabling the unused second channel when just one DIMM is connected,
in order to do power-saving, as recommended on this chipset's datasheet.
However, the BIOS on this particular machine doesn't do it:
[ 16.741421] EDAC DEBUG: how_many_channels: In dual channel mode
[ 16.741424] EDAC DEBUG: how_many_channels: 2 DIMMS per channel enabled
So, the driver were assuming that 2 channels are enabled (well, they are,
but the second is unused).
Combined with that, I found two issues at the logic that creates the
EDAC data, that were failing when the two channels are not equally
filled (AFAICT, that happens only when just 1 DIMM is plugged).
The first one is that a 0 at DRB means that nothing is filled. The
driver's logic, however, do some calculation with that.
The second one is that the logic that fills the DIMM data currently
assumes that both channels are equally filled.
I tested the system already with the current configuration and my
patch and it is now working fine. So, for a 2R single DIMM 2Gb memory
at dimm slot 01 (channel 0), it is now displaying:
[ 16.741406] EDAC DEBUG: i3200_get_drbs: drb[0][0] = 16, drb[1][0] = 0
[ 16.741410] EDAC DEBUG: i3200_get_drbs: drb[0][1] = 32, drb[1][1] = 0
[ 16.741413] EDAC DEBUG: i3200_get_drbs: drb[0][2] = 32, drb[1][2] = 0
[ 16.741416] EDAC DEBUG: i3200_get_drbs: drb[0][3] = 32, drb[1][3] = 0
...
[ 16.741896] EDAC DEBUG: i3200_probe1: csrow 0, channel 0, size = 1024 Mb
[ 16.741899] EDAC DEBUG: i3200_probe1: csrow 1, channel 0, size = 1024 Mb
and the corresponding sysfs nodes are now properly filled.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2013-01-10 09:31:47 -07:00
|
|
|
for (j = 0; j < nr_channels; j++) {
|
EDAC: Replace EDAC_DIMM_PTR() macro with edac_get_dimm() function
The EDAC_DIMM_PTR() macro takes 3 arguments from struct mem_ctl_info.
Clean up this interface to only pass the mci struct and replace this
macro with a new function edac_get_dimm().
Also introduce an edac_get_dimm_by_index() function for later use.
This allows it to get a DIMM pointer only by a given index. This can
be useful if the DIMM's position within the layers of the memory
controller or the exact size of the layers are unknown.
Small style changes made for some hunks after applying the semantic
patch.
Semantic patch used:
@@ expression mci, a, b,c; @@
-EDAC_DIMM_PTR(mci->layers, mci->dimms, mci->n_layers, a, b, c)
+edac_get_dimm(mci, a, b, c)
[ bp: Touchups. ]
Signed-off-by: Robert Richter <rrichter@marvell.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: "linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>
Cc: James Morse <james.morse@arm.com>
Cc: Jason Baron <jbaron@akamai.com>
Cc: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20191106093239.25517-2-rrichter@marvell.com
2019-11-06 02:33:02 -07:00
|
|
|
struct dimm_info *dimm = edac_get_dimm(mci, i, j, 0);
|
2009-09-23 16:57:27 -06:00
|
|
|
|
i3200_edac: Fix the logic that detects filled memories
After running a series of tests on an HP DL320, filled with different
memory sizes, it was noticed that, when filled with just one DIMM
on such hardware, the driver wrongly detects twice the memory, and
thinks that both channels 0 and 1 are filled.
It seems to be partially caused by the BIOS and partially by the driver.
The i3200_edac current logic would be working fine if the BIOS were
disabling the unused second channel when just one DIMM is connected,
in order to do power-saving, as recommended on this chipset's datasheet.
However, the BIOS on this particular machine doesn't do it:
[ 16.741421] EDAC DEBUG: how_many_channels: In dual channel mode
[ 16.741424] EDAC DEBUG: how_many_channels: 2 DIMMS per channel enabled
So, the driver were assuming that 2 channels are enabled (well, they are,
but the second is unused).
Combined with that, I found two issues at the logic that creates the
EDAC data, that were failing when the two channels are not equally
filled (AFAICT, that happens only when just 1 DIMM is plugged).
The first one is that a 0 at DRB means that nothing is filled. The
driver's logic, however, do some calculation with that.
The second one is that the logic that fills the DIMM data currently
assumes that both channels are equally filled.
I tested the system already with the current configuration and my
patch and it is now working fine. So, for a 2R single DIMM 2Gb memory
at dimm slot 01 (channel 0), it is now displaying:
[ 16.741406] EDAC DEBUG: i3200_get_drbs: drb[0][0] = 16, drb[1][0] = 0
[ 16.741410] EDAC DEBUG: i3200_get_drbs: drb[0][1] = 32, drb[1][1] = 0
[ 16.741413] EDAC DEBUG: i3200_get_drbs: drb[0][2] = 32, drb[1][2] = 0
[ 16.741416] EDAC DEBUG: i3200_get_drbs: drb[0][3] = 32, drb[1][3] = 0
...
[ 16.741896] EDAC DEBUG: i3200_probe1: csrow 0, channel 0, size = 1024 Mb
[ 16.741899] EDAC DEBUG: i3200_probe1: csrow 1, channel 0, size = 1024 Mb
and the corresponding sysfs nodes are now properly filled.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2013-01-10 09:31:47 -07:00
|
|
|
nr_pages = drb_to_nr_pages(drbs, stacked, j, i);
|
|
|
|
if (nr_pages == 0)
|
|
|
|
continue;
|
2009-09-23 16:57:27 -06:00
|
|
|
|
2018-09-18 18:34:33 -06:00
|
|
|
edac_dbg(0, "csrow %d, channel %d%s, size = %ld MiB\n", i, j,
|
i3200_edac: Fix the logic that detects filled memories
After running a series of tests on an HP DL320, filled with different
memory sizes, it was noticed that, when filled with just one DIMM
on such hardware, the driver wrongly detects twice the memory, and
thinks that both channels 0 and 1 are filled.
It seems to be partially caused by the BIOS and partially by the driver.
The i3200_edac current logic would be working fine if the BIOS were
disabling the unused second channel when just one DIMM is connected,
in order to do power-saving, as recommended on this chipset's datasheet.
However, the BIOS on this particular machine doesn't do it:
[ 16.741421] EDAC DEBUG: how_many_channels: In dual channel mode
[ 16.741424] EDAC DEBUG: how_many_channels: 2 DIMMS per channel enabled
So, the driver were assuming that 2 channels are enabled (well, they are,
but the second is unused).
Combined with that, I found two issues at the logic that creates the
EDAC data, that were failing when the two channels are not equally
filled (AFAICT, that happens only when just 1 DIMM is plugged).
The first one is that a 0 at DRB means that nothing is filled. The
driver's logic, however, do some calculation with that.
The second one is that the logic that fills the DIMM data currently
assumes that both channels are equally filled.
I tested the system already with the current configuration and my
patch and it is now working fine. So, for a 2R single DIMM 2Gb memory
at dimm slot 01 (channel 0), it is now displaying:
[ 16.741406] EDAC DEBUG: i3200_get_drbs: drb[0][0] = 16, drb[1][0] = 0
[ 16.741410] EDAC DEBUG: i3200_get_drbs: drb[0][1] = 32, drb[1][1] = 0
[ 16.741413] EDAC DEBUG: i3200_get_drbs: drb[0][2] = 32, drb[1][2] = 0
[ 16.741416] EDAC DEBUG: i3200_get_drbs: drb[0][3] = 32, drb[1][3] = 0
...
[ 16.741896] EDAC DEBUG: i3200_probe1: csrow 0, channel 0, size = 1024 Mb
[ 16.741899] EDAC DEBUG: i3200_probe1: csrow 1, channel 0, size = 1024 Mb
and the corresponding sysfs nodes are now properly filled.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2013-01-10 09:31:47 -07:00
|
|
|
stacked ? " (stacked)" : "", PAGES_TO_MiB(nr_pages));
|
2012-01-27 14:38:08 -07:00
|
|
|
|
2012-08-02 14:58:23 -06:00
|
|
|
dimm->nr_pages = nr_pages;
|
2012-01-27 14:38:08 -07:00
|
|
|
dimm->grain = nr_pages << PAGE_SHIFT;
|
|
|
|
dimm->mtype = MEM_DDR2;
|
|
|
|
dimm->dtype = DEV_UNKNOWN;
|
|
|
|
dimm->edac_mode = EDAC_UNKNOWN;
|
|
|
|
}
|
2009-09-23 16:57:27 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
i3200_clear_error_info(mci);
|
|
|
|
|
|
|
|
rc = -ENODEV;
|
|
|
|
if (edac_mc_add_mc(mci)) {
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(3, "MC: failed edac_mc_add_mc()\n");
|
2009-09-23 16:57:27 -06:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get this far and it's successful */
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(3, "MC: success\n");
|
2009-09-23 16:57:27 -06:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
iounmap(window);
|
|
|
|
if (mci)
|
|
|
|
edac_mc_free(mci);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-12-21 14:23:51 -07:00
|
|
|
static int i3200_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
2009-09-23 16:57:27 -06:00
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(0, "MC:\n");
|
2009-09-23 16:57:27 -06:00
|
|
|
|
|
|
|
if (pci_enable_device(pdev) < 0)
|
|
|
|
return -EIO;
|
|
|
|
|
|
|
|
rc = i3200_probe1(pdev, ent->driver_data);
|
|
|
|
if (!mci_pdev)
|
|
|
|
mci_pdev = pci_dev_get(pdev);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-12-21 14:23:51 -07:00
|
|
|
static void i3200_remove_one(struct pci_dev *pdev)
|
2009-09-23 16:57:27 -06:00
|
|
|
{
|
|
|
|
struct mem_ctl_info *mci;
|
|
|
|
struct i3200_priv *priv;
|
|
|
|
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(0, "\n");
|
2009-09-23 16:57:27 -06:00
|
|
|
|
|
|
|
mci = edac_mc_del_mc(&pdev->dev);
|
|
|
|
if (!mci)
|
|
|
|
return;
|
|
|
|
|
|
|
|
priv = mci->pvt_info;
|
|
|
|
iounmap(priv->window);
|
|
|
|
|
|
|
|
edac_mc_free(mci);
|
2014-01-12 21:26:18 -07:00
|
|
|
|
|
|
|
pci_disable_device(pdev);
|
2009-09-23 16:57:27 -06:00
|
|
|
}
|
|
|
|
|
2013-12-06 02:23:08 -07:00
|
|
|
static const struct pci_device_id i3200_pci_tbl[] = {
|
2009-09-23 16:57:27 -06:00
|
|
|
{
|
|
|
|
PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
|
|
|
I3200},
|
|
|
|
{
|
|
|
|
0,
|
|
|
|
} /* 0 terminated list. */
|
|
|
|
};
|
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE(pci, i3200_pci_tbl);
|
|
|
|
|
|
|
|
static struct pci_driver i3200_driver = {
|
|
|
|
.name = EDAC_MOD_STR,
|
|
|
|
.probe = i3200_init_one,
|
2012-12-21 14:23:51 -07:00
|
|
|
.remove = i3200_remove_one,
|
2009-09-23 16:57:27 -06:00
|
|
|
.id_table = i3200_pci_tbl,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init i3200_init(void)
|
|
|
|
{
|
|
|
|
int pci_rc;
|
|
|
|
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(3, "MC:\n");
|
2009-09-23 16:57:27 -06:00
|
|
|
|
|
|
|
/* Ensure that the OPSTATE is set correctly for POLL or NMI */
|
|
|
|
opstate_init();
|
|
|
|
|
|
|
|
pci_rc = pci_register_driver(&i3200_driver);
|
|
|
|
if (pci_rc < 0)
|
|
|
|
goto fail0;
|
|
|
|
|
|
|
|
if (!mci_pdev) {
|
|
|
|
i3200_registered = 0;
|
|
|
|
mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
|
|
|
|
PCI_DEVICE_ID_INTEL_3200_HB, NULL);
|
|
|
|
if (!mci_pdev) {
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(0, "i3200 pci_get_device fail\n");
|
2009-09-23 16:57:27 -06:00
|
|
|
pci_rc = -ENODEV;
|
|
|
|
goto fail1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pci_rc = i3200_init_one(mci_pdev, i3200_pci_tbl);
|
|
|
|
if (pci_rc < 0) {
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(0, "i3200 init fail\n");
|
2009-09-23 16:57:27 -06:00
|
|
|
pci_rc = -ENODEV;
|
|
|
|
goto fail1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail1:
|
|
|
|
pci_unregister_driver(&i3200_driver);
|
|
|
|
|
|
|
|
fail0:
|
2014-11-19 08:00:13 -07:00
|
|
|
pci_dev_put(mci_pdev);
|
2009-09-23 16:57:27 -06:00
|
|
|
|
|
|
|
return pci_rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit i3200_exit(void)
|
|
|
|
{
|
2012-04-29 14:08:39 -06:00
|
|
|
edac_dbg(3, "MC:\n");
|
2009-09-23 16:57:27 -06:00
|
|
|
|
|
|
|
pci_unregister_driver(&i3200_driver);
|
|
|
|
if (!i3200_registered) {
|
|
|
|
i3200_remove_one(mci_pdev);
|
|
|
|
pci_dev_put(mci_pdev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(i3200_init);
|
|
|
|
module_exit(i3200_exit);
|
|
|
|
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
MODULE_AUTHOR("Akamai Technologies, Inc.");
|
|
|
|
MODULE_DESCRIPTION("MC support for Intel 3200 memory hub controllers");
|
|
|
|
|
|
|
|
module_param(edac_op_state, int, 0444);
|
|
|
|
MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
|