drivers-edac: i3000 code tidying (ce783d70) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/edac/i3000_edac.c

+110 −97

Original line number	Original line	Diff line number	Diff line
	@@ -42,9 +42,10 @@
	* 0 Error channel 0/1		* 0 Error channel 0/1
	*/		*/
	#define I3000_DEAP_GRAIN (1 << 7)		#define I3000_DEAP_GRAIN (1 << 7)
	#define I3000_DEAP_PFN(edeap, deap) ((((edeap) & 1) << (32 - PAGE_SHIFT)) \| \		#define I3000_DEAP_PFN(edeap, deap) ((((edeap) & 1) << (32 - PAGE_SHIFT)) \
	((deap) >> PAGE_SHIFT))		\| ((deap) >> PAGE_SHIFT))
	#define I3000_DEAP_OFFSET(deap) ((deap) & ~(I3000_DEAP_GRAIN-1) & ~PAGE_MASK)		#define I3000_DEAP_OFFSET(deap) ((deap) & ~(I3000_DEAP_GRAIN-1) & \
			~PAGE_MASK)
	#define I3000_DEAP_CHANNEL(deap) ((deap) & 1)		#define I3000_DEAP_CHANNEL(deap) ((deap) & 1)

	#define I3000_DERRSYN 0x5c /* DRAM Error Syndrome (8b)		#define I3000_DERRSYN 0x5c /* DRAM Error Syndrome (8b)
	@@ -55,12 +56,13 @@
	#define I3000_ERRSTS 0xc8 /* Error Status Register (16b)		#define I3000_ERRSTS 0xc8 /* Error Status Register (16b)
	*		*
	* 15:12 reserved		* 15:12 reserved
	* 11 MCH Thermal Sensor Event for SMI/SCI/SERR		* 11 MCH Thermal Sensor Event
			* for SMI/SCI/SERR
	* 10 reserved		* 10 reserved
	* 9 LOCK to non-DRAM Memory Flag (LCKF)		* 9 LOCK to non-DRAM Memory Flag (LCKF)
	* 8 Received Refresh Timeout Flag (RRTOF)		* 8 Received Refresh Timeout Flag (RRTOF)
	* 7:2 reserved		* 7:2 reserved
	* 1 Multiple-bit DRAM ECC Error Flag (DMERR)		* 1 Multi-bit DRAM ECC Error Flag (DMERR)
	* 0 Single-bit DRAM ECC Error Flag (DSERR)		* 0 Single-bit DRAM ECC Error Flag (DSERR)
	*/		*/
	#define I3000_ERRSTS_BITS 0x0b03 /* bits which indicate errors */		#define I3000_ERRSTS_BITS 0x0b03 /* bits which indicate errors */
	@@ -70,13 +72,18 @@
	#define I3000_ERRCMD 0xca /* Error Command (16b)		#define I3000_ERRCMD 0xca /* Error Command (16b)
	*		*
	* 15:12 reserved		* 15:12 reserved
	* 11 SERR on MCH Thermal Sensor Event (TSESERR)		* 11 SERR on MCH Thermal Sensor Event
			* (TSESERR)
	* 10 reserved		* 10 reserved
	* 9 SERR on LOCK to non-DRAM Memory (LCKERR)		* 9 SERR on LOCK to non-DRAM Memory
	* 8 SERR on DRAM Refresh Timeout (DRTOERR)		* (LCKERR)
			* 8 SERR on DRAM Refresh Timeout
			* (DRTOERR)
	* 7:2 reserved		* 7:2 reserved
	* 1 SERR Multiple-Bit DRAM ECC Error (DMERR)		* 1 SERR Multi-Bit DRAM ECC Error
	* 0 SERR on Single-Bit ECC Error (DSERR)		* (DMERR)
			* 0 SERR on Single-Bit ECC Error
			* (DSERR)
	*/		*/

	/* Intel MMIO register space - device 0 function 0 - MMR space */		/* Intel MMIO register space - device 0 function 0 - MMR space */
	@@ -187,7 +194,8 @@ static void i3000_get_error_info(struct mem_ctl_info *mci,
	pci_read_config_byte(pdev, I3000_DERRSYN, &info->derrsyn);		pci_read_config_byte(pdev, I3000_DERRSYN, &info->derrsyn);
	}		}

	/* Clear any error bits.		/*
			* Clear any error bits.
	* (Yes, we really clear bits by writing 1 to them.)		* (Yes, we really clear bits by writing 1 to them.)
	*/		*/
	pci_write_bits16(pdev, I3000_ERRSTS, I3000_ERRSTS_BITS,		pci_write_bits16(pdev, I3000_ERRSTS, I3000_ERRSTS_BITS,
	@@ -245,7 +253,8 @@ static int i3000_is_interleaved(const unsigned char *c0dra,
	{		{
	int i;		int i;

	/* If the channels aren't populated identically then		/*
			* If the channels aren't populated identically then
	* we're not interleaved.		* we're not interleaved.
	*/		*/
	for (i = 0; i < I3000_RANKS_PER_CHANNEL / 2; i++)		for (i = 0; i < I3000_RANKS_PER_CHANNEL / 2; i++)
	@@ -254,7 +263,8 @@ static int i3000_is_interleaved(const unsigned char *c0dra,
	EVEN_RANK_ATTRIB(c1dra[i]))		EVEN_RANK_ATTRIB(c1dra[i]))
	return 0;		return 0;

	/* If the rank boundaries for the two channels are different		/*
			* If the rank boundaries for the two channels are different
	* then we're not interleaved.		* then we're not interleaved.
	*/		*/
	for (i = 0; i < I3000_RANKS_PER_CHANNEL; i++)		for (i = 0; i < I3000_RANKS_PER_CHANNEL; i++)
	@@ -300,7 +310,8 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)

	iounmap(window);		iounmap(window);

	/* Figure out how many channels we have.		/*
			* Figure out how many channels we have.
	*		*
	* If we have what the datasheet calls "asymmetric channels"		* If we have what the datasheet calls "asymmetric channels"
	* (essentially the same as what was called "virtual single		* (essentially the same as what was called "virtual single
	@@ -363,7 +374,8 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
	csrow->edac_mode = EDAC_UNKNOWN;		csrow->edac_mode = EDAC_UNKNOWN;
	}		}

	/* Clear any error bits.		/*
			* Clear any error bits.
	* (Yes, we really clear bits by writing 1 to them.)		* (Yes, we really clear bits by writing 1 to them.)
	*/		*/
	pci_write_bits16(pdev, I3000_ERRSTS, I3000_ERRSTS_BITS,		pci_write_bits16(pdev, I3000_ERRSTS, I3000_ERRSTS_BITS,
	@@ -409,7 +421,7 @@ static int __devinit i3000_init_one(struct pci_dev *pdev,
	return -EIO;		return -EIO;

	rc = i3000_probe1(pdev, ent->driver_data);		rc = i3000_probe1(pdev, ent->driver_data);
	if (mci_pdev == NULL)		if (!mci_pdev)
	mci_pdev = pci_dev_get(pdev);		mci_pdev = pci_dev_get(pdev);

	return rc;		return rc;
	@@ -424,7 +436,8 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
	if (i3000_pci)		if (i3000_pci)
	edac_pci_release_generic_ctl(i3000_pci);		edac_pci_release_generic_ctl(i3000_pci);

	if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)		mci = edac_mc_del_mc(&pdev->dev);
			if (!mci)
	return;		return;

	edac_mc_free(mci);		edac_mc_free(mci);
	@@ -457,7 +470,7 @@ static int __init i3000_init(void)
	if (pci_rc < 0)		if (pci_rc < 0)
	goto fail0;		goto fail0;

	if (mci_pdev == NULL) {		if (!mci_pdev) {
	i3000_registered = 0;		i3000_registered = 0;
	mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,		mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
	PCI_DEVICE_ID_INTEL_3000_HB, NULL);		PCI_DEVICE_ID_INTEL_3000_HB, NULL);