Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 978ca164 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (38 commits)
  amd64_edac: Fix decode_syndrome types
  amd64_edac: Fix DCT argument type
  amd64_edac: Fix ranges signedness
  amd64_edac: Drop local variable
  amd64_edac: Fix PCI config addressing types
  amd64_edac: Fix DRAM base macros
  amd64_edac: Fix node id signedness
  amd64_edac: Drop redundant declarations
  amd64_edac: Enable driver on F15h
  amd64_edac: Adjust ECC symbol size to F15h
  amd64_edac: Simplify scrubrate setting
  PCI: Rename CPU PCI id define
  amd64_edac: Improve DRAM address mapping
  amd64_edac: Sanitize ->read_dram_ctl_register
  amd64_edac: Adjust sys_addr to chip select conversion routine to F15h
  amd64_edac: Beef up early exit reporting
  amd64_edac: Revamp online spare handling
  amd64_edac: Fix channel interleave removal
  amd64_edac: Correct node interleaving removal
  amd64_edac: Add support for interleaved region swapping
  ...

Fix up trivial conflict in include/linux/pci_ids.h due to
AMD_15H_NB_MISC being renamed as AMD_15H_NB_F3 next to the new
AMD_15H_NB_LINK entry.
parents 02e4c627 d34a6ecd

arch/x86/kernel/amd_nb.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ static u32 *flush_words; 
const struct pci_device_id amd_nb_misc_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_MISC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },

	{}

};

EXPORT_SYMBOL(amd_nb_misc_ids);

drivers/edac/amd64_edac.c

+678 −764

File changed.

Preview size limit exceeded, changes collapsed.

drivers/edac/amd64_edac.h

+137 −232
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ 
 *         sections 3.5.4 and 3.5.5 for more information.

 */



#define EDAC_AMD64_VERSION		"v3.3.0"

#define EDAC_AMD64_VERSION		"3.4.0"

#define EDAC_MOD_STR			"amd64_edac"



/* Extended Model from CPUID, for CPU Revision numbers */
@@ -153,85 +153,64 @@ 
#define K8_REV_F			4



/* Hardware limit on ChipSelect rows per MC and processors per system */

#define MAX_CS_COUNT			8

#define DRAM_REG_COUNT			8

#define NUM_CHIPSELECTS			8

#define DRAM_RANGES			8



#define ON true

#define OFF false



/*

 * Create a contiguous bitmask starting at bit position @lo and ending at

 * position @hi. For example

 *

 * GENMASK(21, 39) gives us the 64bit vector 0x000000ffffe00000.

 */

#define GENMASK(lo, hi)			(((1ULL << ((hi) - (lo) + 1)) - 1) << (lo))



/*

 * PCI-defined configuration space registers

 */

#define PCI_DEVICE_ID_AMD_15H_NB_F1	0x1601

#define PCI_DEVICE_ID_AMD_15H_NB_F2	0x1602





/*

 * Function 1 - Address Map

 */

#define K8_DRAM_BASE_LOW		0x40

#define K8_DRAM_LIMIT_LOW		0x44

#define K8_DHAR				0xf0



#define DHAR_VALID			BIT(0)

#define F10_DRAM_MEM_HOIST_VALID	BIT(1)

#define DRAM_BASE_LO			0x40

#define DRAM_LIMIT_LO			0x44



#define DHAR_BASE_MASK			0xff000000

#define dhar_base(dhar)			(dhar & DHAR_BASE_MASK)

#define dram_intlv_en(pvt, i)		((u8)((pvt->ranges[i].base.lo >> 8) & 0x7))

#define dram_rw(pvt, i)			((u8)(pvt->ranges[i].base.lo & 0x3))

#define dram_intlv_sel(pvt, i)		((u8)((pvt->ranges[i].lim.lo >> 8) & 0x7))

#define dram_dst_node(pvt, i)		((u8)(pvt->ranges[i].lim.lo & 0x7))



#define K8_DHAR_OFFSET_MASK		0x0000ff00

#define k8_dhar_offset(dhar)		((dhar & K8_DHAR_OFFSET_MASK) << 16)

#define DHAR				0xf0

#define dhar_valid(pvt)			((pvt)->dhar & BIT(0))

#define dhar_mem_hoist_valid(pvt)	((pvt)->dhar & BIT(1))

#define dhar_base(pvt)			((pvt)->dhar & 0xff000000)

#define k8_dhar_offset(pvt)		(((pvt)->dhar & 0x0000ff00) << 16)



#define F10_DHAR_OFFSET_MASK		0x0000ff80

					/* NOTE: Extra mask bit vs K8 */

#define f10_dhar_offset(dhar)		((dhar & F10_DHAR_OFFSET_MASK) << 16)

#define f10_dhar_offset(pvt)		(((pvt)->dhar & 0x0000ff80) << 16)



#define DCT_CFG_SEL			0x10C



/* F10 High BASE/LIMIT registers */

#define F10_DRAM_BASE_HIGH		0x140

#define F10_DRAM_LIMIT_HIGH		0x144

#define DRAM_BASE_HI			0x140

#define DRAM_LIMIT_HI			0x144





/*

 * Function 2 - DRAM controller

 */

#define K8_DCSB0			0x40

#define F10_DCSB1			0x140



#define K8_DCSB_CS_ENABLE		BIT(0)

#define K8_DCSB_NPT_SPARE		BIT(1)

#define K8_DCSB_NPT_TESTFAIL		BIT(2)



/*

 * REV E: select [31:21] and [15:9] from DCSB and the shift amount to form

 * the address

 */

#define REV_E_DCSB_BASE_BITS		(0xFFE0FE00ULL)

#define REV_E_DCS_SHIFT			4

#define DCSB0				0x40

#define DCSB1				0x140

#define DCSB_CS_ENABLE			BIT(0)



#define REV_F_F1Xh_DCSB_BASE_BITS	(0x1FF83FE0ULL)

#define REV_F_F1Xh_DCS_SHIFT		8

#define DCSM0				0x60

#define DCSM1				0x160



/*

 * REV F and later: selects [28:19] and [13:5] from DCSB and the shift amount

 * to form the address

 */

#define REV_F_DCSB_BASE_BITS		(0x1FF83FE0ULL)

#define REV_F_DCS_SHIFT			8



/* DRAM CS Mask Registers */

#define K8_DCSM0			0x60

#define F10_DCSM1			0x160



/* REV E: select [29:21] and [15:9] from DCSM */

#define REV_E_DCSM_MASK_BITS		0x3FE0FE00



/* unused bits [24:20] and [12:0] */

#define REV_E_DCS_NOTUSED_BITS		0x01F01FFF



/* REV F and later: select [28:19] and [13:5] from DCSM */

#define REV_F_F1Xh_DCSM_MASK_BITS	0x1FF83FE0



/* unused bits [26:22] and [12:0] */

#define REV_F_F1Xh_DCS_NOTUSED_BITS	0x07C01FFF

#define csrow_enabled(i, dct, pvt)	((pvt)->csels[(dct)].csbases[(i)] & DCSB_CS_ENABLE)



#define DBAM0				0x80

#define DBAM1				0x180
@@ -241,148 +220,84 @@ 


#define DBAM_MAX_VALUE			11





#define F10_DCLR_0			0x90

#define F10_DCLR_1			0x190

#define DCLR0				0x90

#define DCLR1				0x190

#define REVE_WIDTH_128			BIT(16)

#define F10_WIDTH_128			BIT(11)

#define WIDTH_128			BIT(11)



#define DCHR0				0x94

#define DCHR1				0x194

#define DDR3_MODE			BIT(8)



#define F10_DCHR_0			0x94

#define F10_DCHR_1			0x194

#define DCT_SEL_LO			0x110

#define dct_sel_baseaddr(pvt)		((pvt)->dct_sel_lo & 0xFFFFF800)

#define dct_sel_interleave_addr(pvt)	(((pvt)->dct_sel_lo >> 6) & 0x3)

#define dct_high_range_enabled(pvt)	((pvt)->dct_sel_lo & BIT(0))

#define dct_interleave_enabled(pvt)	((pvt)->dct_sel_lo & BIT(2))



#define F10_DCHR_FOUR_RANK_DIMM		BIT(18)

#define DDR3_MODE			BIT(8)

#define F10_DCHR_MblMode		BIT(6)

#define dct_ganging_enabled(pvt)	((boot_cpu_data.x86 == 0x10) && ((pvt)->dct_sel_lo & BIT(4)))



#define dct_data_intlv_enabled(pvt)	((pvt)->dct_sel_lo & BIT(5))

#define dct_memory_cleared(pvt)		((pvt)->dct_sel_lo & BIT(10))



#define F10_DCTL_SEL_LOW		0x110

#define dct_sel_baseaddr(pvt)		((pvt->dram_ctl_select_low) & 0xFFFFF800)

#define dct_sel_interleave_addr(pvt)	(((pvt->dram_ctl_select_low) >> 6) & 0x3)

#define dct_high_range_enabled(pvt)	(pvt->dram_ctl_select_low & BIT(0))

#define dct_interleave_enabled(pvt)	(pvt->dram_ctl_select_low & BIT(2))

#define dct_ganging_enabled(pvt)	(pvt->dram_ctl_select_low & BIT(4))

#define dct_data_intlv_enabled(pvt)	(pvt->dram_ctl_select_low & BIT(5))

#define dct_dram_enabled(pvt)		(pvt->dram_ctl_select_low & BIT(8))

#define dct_memory_cleared(pvt)		(pvt->dram_ctl_select_low & BIT(10))

#define SWAP_INTLV_REG			0x10c



#define F10_DCTL_SEL_HIGH		0x114

#define DCT_SEL_HI			0x114



/*

 * Function 3 - Misc Control

 */

#define K8_NBCTL			0x40



/* Correctable ECC error reporting enable */

#define K8_NBCTL_CECCEn			BIT(0)



/* UnCorrectable ECC error reporting enable */

#define K8_NBCTL_UECCEn			BIT(1)



#define K8_NBCFG			0x44

#define K8_NBCFG_CHIPKILL		BIT(23)

#define K8_NBCFG_ECC_ENABLE		BIT(22)



#define K8_NBSL				0x48

#define NBCTL				0x40



#define NBCFG				0x44

#define NBCFG_CHIPKILL			BIT(23)

#define NBCFG_ECC_ENABLE		BIT(22)



/* Family F10h: Normalized Extended Error Codes */

#define F10_NBSL_EXT_ERR_RES		0x0

/* F3x48: NBSL */

#define F10_NBSL_EXT_ERR_ECC		0x8

#define NBSL_PP_OBS			0x2



/* Next two are overloaded values */

#define F10_NBSL_EXT_ERR_LINK_PROTO	0xB

#define F10_NBSL_EXT_ERR_L3_PROTO	0xB



#define F10_NBSL_EXT_ERR_NB_ARRAY	0xC

#define F10_NBSL_EXT_ERR_DRAM_PARITY	0xD

#define F10_NBSL_EXT_ERR_LINK_RETRY	0xE



/* Next two are overloaded values */

#define F10_NBSL_EXT_ERR_GART_WALK	0xF

#define F10_NBSL_EXT_ERR_DEV_WALK	0xF



/* 0x10 to 0x1B: Reserved */

#define F10_NBSL_EXT_ERR_L3_DATA	0x1C

#define F10_NBSL_EXT_ERR_L3_TAG		0x1D

#define F10_NBSL_EXT_ERR_L3_LRU		0x1E



/* K8: Normalized Extended Error Codes */

#define K8_NBSL_EXT_ERR_ECC		0x0

#define K8_NBSL_EXT_ERR_CRC		0x1

#define K8_NBSL_EXT_ERR_SYNC		0x2

#define K8_NBSL_EXT_ERR_MST		0x3

#define K8_NBSL_EXT_ERR_TGT		0x4

#define K8_NBSL_EXT_ERR_GART		0x5

#define K8_NBSL_EXT_ERR_RMW		0x6

#define K8_NBSL_EXT_ERR_WDT		0x7

#define K8_NBSL_EXT_ERR_CHIPKILL_ECC	0x8

#define K8_NBSL_EXT_ERR_DRAM_PARITY	0xD



/*

 * The following are for BUS type errors AFTER values have been normalized by

 * shifting right

 */

#define K8_NBSL_PP_SRC			0x0

#define K8_NBSL_PP_RES			0x1

#define K8_NBSL_PP_OBS			0x2

#define K8_NBSL_PP_GENERIC		0x3



#define EXTRACT_ERR_CPU_MAP(x)		((x) & 0xF)



#define K8_NBEAL			0x50

#define K8_NBEAH			0x54

#define K8_SCRCTRL			0x58



#define F10_NB_CFG_LOW			0x88

#define SCRCTRL				0x58



#define F10_ONLINE_SPARE		0xB0

#define F10_ONLINE_SPARE_SWAPDONE0(x)	((x) & BIT(1))

#define F10_ONLINE_SPARE_SWAPDONE1(x)	((x) & BIT(3))

#define F10_ONLINE_SPARE_BADDRAM_CS0(x) (((x) >> 4) & 0x00000007)

#define F10_ONLINE_SPARE_BADDRAM_CS1(x) (((x) >> 8) & 0x00000007)

#define online_spare_swap_done(pvt, c)	(((pvt)->online_spare >> (1 + 2 * (c))) & 0x1)

#define online_spare_bad_dramcs(pvt, c)	(((pvt)->online_spare >> (4 + 4 * (c))) & 0x7)



#define F10_NB_ARRAY_ADDR		0xB8



#define F10_NB_ARRAY_DRAM_ECC		0x80000000

#define F10_NB_ARRAY_DRAM_ECC		BIT(31)



/* Bits [2:1] are used to select 16-byte section within a 64-byte cacheline  */

#define SET_NB_ARRAY_ADDRESS(section)	(((section) & 0x3) << 1)



#define F10_NB_ARRAY_DATA		0xBC



#define SET_NB_DRAM_INJECTION_WRITE(word, bits)  \

					(BIT(((word) & 0xF) + 20) | \

					BIT(17) | bits)



#define SET_NB_DRAM_INJECTION_READ(word, bits)  \

					(BIT(((word) & 0xF) + 20) | \

					BIT(16) |  bits)



#define K8_NBCAP			0xE8

#define K8_NBCAP_CORES			(BIT(12)|BIT(13))

#define K8_NBCAP_CHIPKILL		BIT(4)

#define K8_NBCAP_SECDED			BIT(3)

#define K8_NBCAP_DCT_DUAL		BIT(0)

#define NBCAP				0xE8

#define NBCAP_CHIPKILL			BIT(4)

#define NBCAP_SECDED			BIT(3)

#define NBCAP_DCT_DUAL			BIT(0)



#define EXT_NB_MCA_CFG			0x180



/* MSRs */

#define K8_MSR_MCGCTL_NBE		BIT(4)



#define K8_MSR_MC4CTL			0x0410

#define K8_MSR_MC4STAT			0x0411

#define K8_MSR_MC4ADDR			0x0412

#define MSR_MCGCTL_NBE			BIT(4)



/* AMD sets the first MC device at device ID 0x18. */

static inline int get_node_id(struct pci_dev *pdev)

static inline u8 get_node_id(struct pci_dev *pdev)

{

	return PCI_SLOT(pdev->devfn) - 0x18;

}



enum amd64_chipset_families {

enum amd_families {

	K8_CPUS = 0,

	F10_CPUS,

	F15_CPUS,

	NUM_FAMILIES,

};



/* Error injection control structure */
@@ -392,13 +307,35 @@ struct error_injection { 
	u32	bit_map;

};



/* low and high part of PCI config space regs */

struct reg_pair {

	u32 lo, hi;

};



/*

 * See F1x[1, 0][7C:40] DRAM Base/Limit Registers

 */

struct dram_range {

	struct reg_pair base;

	struct reg_pair lim;

};



/* A DCT chip selects collection */

struct chip_select {

	u32 csbases[NUM_CHIPSELECTS];

	u8 b_cnt;



	u32 csmasks[NUM_CHIPSELECTS];

	u8 m_cnt;

};



struct amd64_pvt {

	struct low_ops *ops;



	/* pci_device handles which we utilize */

	struct pci_dev *F1, *F2, *F3;



	int mc_node_id;		/* MC index of this MC node */

	unsigned mc_node_id;	/* MC index of this MC node */

	int ext_model;		/* extended model value of this node */

	int channel_count;
@@ -414,60 +351,50 @@ struct amd64_pvt { 
	u32 dbam0;		/* DRAM Base Address Mapping reg for DCT0 */

	u32 dbam1;		/* DRAM Base Address Mapping reg for DCT1 */



	/* DRAM CS Base Address Registers F2x[1,0][5C:40] */

	u32 dcsb0[MAX_CS_COUNT];

	u32 dcsb1[MAX_CS_COUNT];



	/* DRAM CS Mask Registers F2x[1,0][6C:60] */

	u32 dcsm0[MAX_CS_COUNT];

	u32 dcsm1[MAX_CS_COUNT];



	/*

	 * Decoded parts of DRAM BASE and LIMIT Registers

	 * F1x[78,70,68,60,58,50,48,40]

	 */

	u64 dram_base[DRAM_REG_COUNT];

	u64 dram_limit[DRAM_REG_COUNT];

	u8  dram_IntlvSel[DRAM_REG_COUNT];

	u8  dram_IntlvEn[DRAM_REG_COUNT];

	u8  dram_DstNode[DRAM_REG_COUNT];

	u8  dram_rw_en[DRAM_REG_COUNT];

	/* one for each DCT */

	struct chip_select csels[2];



	/*

	 * The following fields are set at (load) run time, after CPU revision

	 * has been determined, since the dct_base and dct_mask registers vary

	 * based on revision

	 */

	u32 dcsb_base;		/* DCSB base bits */

	u32 dcsm_mask;		/* DCSM mask bits */

	u32 cs_count;		/* num chip selects (== num DCSB registers) */

	u32 num_dcsm;		/* Number of DCSM registers */

	u32 dcs_mask_notused;	/* DCSM notused mask bits */

	u32 dcs_shift;		/* DCSB and DCSM shift value */

	/* DRAM base and limit pairs F1x[78,70,68,60,58,50,48,40] */

	struct dram_range ranges[DRAM_RANGES];



	u64 top_mem;		/* top of memory below 4GB */

	u64 top_mem2;		/* top of memory above 4GB */



	u32 dram_ctl_select_low;	/* DRAM Controller Select Low Reg */

	u32 dram_ctl_select_high;	/* DRAM Controller Select High Reg */

	u32 dct_sel_lo;		/* DRAM Controller Select Low */

	u32 dct_sel_hi;		/* DRAM Controller Select High */

	u32 online_spare;	/* On-Line spare Reg */



	/* x4 or x8 syndromes in use */

	u8 syn_type;



	/* temp storage for when input is received from sysfs */

	struct err_regs ctl_error_info;

	u8 ecc_sym_sz;



	/* place to store error injection parameters prior to issue */

	struct error_injection injection;

};



	/* DCT per-family scrubrate setting */

	u32 min_scrubrate;

static inline u64 get_dram_base(struct amd64_pvt *pvt, unsigned i)

{

	u64 addr = ((u64)pvt->ranges[i].base.lo & 0xffff0000) << 8;



	/* family name this instance is running on */

	const char *ctl_name;

	if (boot_cpu_data.x86 == 0xf)

		return addr;



};

	return (((u64)pvt->ranges[i].base.hi & 0x000000ff) << 40) | addr;

}



static inline u64 get_dram_limit(struct amd64_pvt *pvt, unsigned i)

{

	u64 lim = (((u64)pvt->ranges[i].lim.lo & 0xffff0000) << 8) | 0x00ffffff;



	if (boot_cpu_data.x86 == 0xf)

		return lim;



	return (((u64)pvt->ranges[i].lim.hi & 0x000000ff) << 40) | lim;

}



static inline u16 extract_syndrome(u64 status)

{

	return ((status >> 47) & 0xff) | ((status >> 16) & 0xff00);

}



/*

 * per-node ECC settings descriptor
@@ -482,14 +409,6 @@ struct ecc_settings { 
	} flags;

};



extern const char *tt_msgs[4];

extern const char *ll_msgs[4];

extern const char *rrrr_msgs[16];

extern const char *to_msgs[2];

extern const char *pp_msgs[4];

extern const char *ii_msgs[4];

extern const char *htlink_msgs[8];



#ifdef CONFIG_EDAC_DEBUG

#define NUM_DBG_ATTRS 5

#else
@@ -511,14 +430,11 @@ extern struct mcidev_sysfs_attribute amd64_dbg_attrs[NUM_DBG_ATTRS], 
 */

struct low_ops {

	int (*early_channel_count)	(struct amd64_pvt *pvt);



	u64 (*get_error_address)	(struct mem_ctl_info *mci,

					 struct err_regs *info);

	void (*read_dram_base_limit)	(struct amd64_pvt *pvt, int dram);

	void (*read_dram_ctl_register)	(struct amd64_pvt *pvt);

	void (*map_sysaddr_to_csrow)	(struct mem_ctl_info *mci,

					 struct err_regs *info, u64 SystemAddr);

	int (*dbam_to_cs)		(struct amd64_pvt *pvt, int cs_mode);

	void (*map_sysaddr_to_csrow)	(struct mem_ctl_info *mci, u64 sys_addr,

					 u16 syndrome);

	int (*dbam_to_cs)		(struct amd64_pvt *pvt, u8 dct, unsigned cs_mode);

	int (*read_dct_pci_cfg)		(struct amd64_pvt *pvt, int offset,

					 u32 *val, const char *func);

};



struct amd64_family_type {
@@ -527,28 +443,17 @@ struct amd64_family_type { 
	struct low_ops ops;

};



static inline int amd64_read_pci_cfg_dword(struct pci_dev *pdev, int offset,

					   u32 *val, const char *func)

{

	int err = 0;



	err = pci_read_config_dword(pdev, offset, val);

	if (err)

		amd64_warn("%s: error reading F%dx%x.\n",

			   func, PCI_FUNC(pdev->devfn), offset);



	return err;

}

int __amd64_write_pci_cfg_dword(struct pci_dev *pdev, int offset,

				u32 val, const char *func);



#define amd64_read_pci_cfg(pdev, offset, val)	\

	amd64_read_pci_cfg_dword(pdev, offset, val, __func__)

	__amd64_read_pci_cfg_dword(pdev, offset, val, __func__)



/*

 * For future CPU versions, verify the following as new 'slow' rates appear and

 * modify the necessary skip values for the supported CPU.

 */

#define K8_MIN_SCRUB_RATE_BITS	0x0

#define F10_MIN_SCRUB_RATE_BITS	0x5

#define amd64_write_pci_cfg(pdev, offset, val)	\

	__amd64_write_pci_cfg_dword(pdev, offset, val, __func__)



#define amd64_read_dct_pci_cfg(pvt, offset, val) \

	pvt->ops->read_dct_pci_cfg(pvt, offset, val, __func__)



int amd64_get_dram_hole_info(struct mem_ctl_info *mci, u64 *hole_base,

			     u64 *hole_offset, u64 *hole_size);

drivers/edac/amd64_edac_inj.c

+4 −4
Original line number Diff line number Diff line
@@ -117,13 +117,13 @@ static ssize_t amd64_inject_read_store(struct mem_ctl_info *mci, 
		/* Form value to choose 16-byte section of cacheline */

		section = F10_NB_ARRAY_DRAM_ECC |

				SET_NB_ARRAY_ADDRESS(pvt->injection.section);

		pci_write_config_dword(pvt->F3, F10_NB_ARRAY_ADDR, section);

		amd64_write_pci_cfg(pvt->F3, F10_NB_ARRAY_ADDR, section);



		word_bits = SET_NB_DRAM_INJECTION_READ(pvt->injection.word,

						pvt->injection.bit_map);



		/* Issue 'word' and 'bit' along with the READ request */

		pci_write_config_dword(pvt->F3, F10_NB_ARRAY_DATA, word_bits);

		amd64_write_pci_cfg(pvt->F3, F10_NB_ARRAY_DATA, word_bits);



		debugf0("section=0x%x word_bits=0x%x\n", section, word_bits);
@@ -150,13 +150,13 @@ static ssize_t amd64_inject_write_store(struct mem_ctl_info *mci, 
		/* Form value to choose 16-byte section of cacheline */

		section = F10_NB_ARRAY_DRAM_ECC |

				SET_NB_ARRAY_ADDRESS(pvt->injection.section);

		pci_write_config_dword(pvt->F3, F10_NB_ARRAY_ADDR, section);

		amd64_write_pci_cfg(pvt->F3, F10_NB_ARRAY_ADDR, section);



		word_bits = SET_NB_DRAM_INJECTION_WRITE(pvt->injection.word,

						pvt->injection.bit_map);



		/* Issue 'word' and 'bit' along with the READ request */

		pci_write_config_dword(pvt->F3, F10_NB_ARRAY_DATA, word_bits);

		amd64_write_pci_cfg(pvt->F3, F10_NB_ARRAY_DATA, word_bits);



		debugf0("section=0x%x word_bits=0x%x\n", section, word_bits);

drivers/edac/edac_mc_sysfs.c

+13 −13
Original line number Diff line number Diff line
@@ -785,10 +785,10 @@ static int edac_create_mci_instance_attributes(struct mem_ctl_info *mci, 
{

	int err;



	debugf1("%s()\n", __func__);

	debugf4("%s()\n", __func__);



	while (sysfs_attrib) {

		debugf1("%s() sysfs_attrib = %p\n",__func__, sysfs_attrib);

		debugf4("%s() sysfs_attrib = %p\n",__func__, sysfs_attrib);

		if (sysfs_attrib->grp) {

			struct mcidev_sysfs_group_kobj *grp_kobj;
@@ -818,7 +818,7 @@ static int edac_create_mci_instance_attributes(struct mem_ctl_info *mci, 
			if (err < 0)

				return err;

		} else if (sysfs_attrib->attr.name) {

			debugf0("%s() file %s\n", __func__,

			debugf4("%s() file %s\n", __func__,

				sysfs_attrib->attr.name);



			err = sysfs_create_file(kobj, &sysfs_attrib->attr);
@@ -853,26 +853,26 @@ static void edac_remove_mci_instance_attributes(struct mem_ctl_info *mci, 
	 * Remove first all the atributes

	 */

	while (sysfs_attrib) {

		debugf1("%s() sysfs_attrib = %p\n",__func__, sysfs_attrib);

		debugf4("%s() sysfs_attrib = %p\n",__func__, sysfs_attrib);

		if (sysfs_attrib->grp) {

			debugf1("%s() seeking for group %s\n",

			debugf4("%s() seeking for group %s\n",

				__func__, sysfs_attrib->grp->name);

			list_for_each_entry(grp_kobj,

					    &mci->grp_kobj_list, list) {

				debugf1("%s() grp_kobj->grp = %p\n",__func__, grp_kobj->grp);

				debugf4("%s() grp_kobj->grp = %p\n",__func__, grp_kobj->grp);

				if (grp_kobj->grp == sysfs_attrib->grp) {

					edac_remove_mci_instance_attributes(mci,

						    grp_kobj->grp->mcidev_attr,

						    &grp_kobj->kobj, count + 1);

					debugf0("%s() group %s\n", __func__,

					debugf4("%s() group %s\n", __func__,

						sysfs_attrib->grp->name);

					kobject_put(&grp_kobj->kobj);

				}

			}

			debugf1("%s() end of seeking for group %s\n",

			debugf4("%s() end of seeking for group %s\n",

				__func__, sysfs_attrib->grp->name);

		} else if (sysfs_attrib->attr.name) {

			debugf0("%s() file %s\n", __func__,

			debugf4("%s() file %s\n", __func__,

				sysfs_attrib->attr.name);

			sysfs_remove_file(kobj, &sysfs_attrib->attr);

		} else
@@ -979,7 +979,7 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci) 
	debugf0("%s()\n", __func__);



	/* remove all csrow kobjects */

	debugf0("%s()  unregister this mci kobj\n", __func__);

	debugf4("%s()  unregister this mci kobj\n", __func__);

	for (i = 0; i < mci->nr_csrows; i++) {

		if (mci->csrows[i].nr_pages > 0) {

			debugf0("%s()  unreg csrow-%d\n", __func__, i);
@@ -989,18 +989,18 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci) 


	/* remove this mci instance's attribtes */

	if (mci->mc_driver_sysfs_attributes) {

		debugf0("%s()  unregister mci private attributes\n", __func__);

		debugf4("%s()  unregister mci private attributes\n", __func__);

		edac_remove_mci_instance_attributes(mci,

						mci->mc_driver_sysfs_attributes,

						&mci->edac_mci_kobj, 0);

	}



	/* remove the symlink */

	debugf0("%s()  remove_link\n", __func__);

	debugf4("%s()  remove_link\n", __func__);

	sysfs_remove_link(&mci->edac_mci_kobj, EDAC_DEVICE_SYMLINK);



	/* unregister this instance's kobject */

	debugf0("%s()  remove_mci_instance\n", __func__);

	debugf4("%s()  remove_mci_instance\n", __func__);

	kobject_put(&mci->edac_mci_kobj);

}