redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

drivers-edac: i3000 code tidying

Browse source 
Style cleanup, mostly just 80-column fixes.

Signed-off-by: Jason Uhlenkott <juhlenko@akamai.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk
Signed-off-by: Doug Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jason Uhlenkott 2008-02-07 00:14:53 -08:00 committed by Linus Torvalds
parent 48764e4143
commit ce783d70b9
1 changed files with 106 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

199
drivers/edac/i3000_edac.c
View file

@ -30,105 +30,112 @@
#define I3000_MCHBAR_MASK 0xffffc000 #define I3000_MCHBAR_MASK 0xffffc000
#define I3000_MMR_WINDOW_SIZE 16384 #define I3000_MMR_WINDOW_SIZE 16384
#define I3000_EDEAP 0x70 /* Extended DRAM Error Address Pointer (8b) #define I3000_EDEAP 0x70 /* Extended DRAM Error Address Pointer (8b)
* *
* 7:1 reserved * 7:1 reserved
* 0 bit 32 of address * 0 bit 32 of address
*/ */
#define I3000_DEAP 0x58 /* DRAM Error Address Pointer (32b) #define I3000_DEAP 0x58 /* DRAM Error Address Pointer (32b)
* *
* 31:7 address * 31:7 address
* 6:1 reserved * 6:1 reserved
* 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)
* *
* 7:0 DRAM ECC Syndrome * 7:0 DRAM ECC Syndrome
*/ */
#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
* 10 reserved * for SMI/SCI/SERR
* 9 LOCK to non-DRAM Memory Flag (LCKF) * 10 reserved
* 8 Received Refresh Timeout Flag (RRTOF) * 9 LOCK to non-DRAM Memory Flag (LCKF)
* 7:2 reserved * 8 Received Refresh Timeout Flag (RRTOF)
* 1 Multiple-bit DRAM ECC Error Flag (DMERR) * 7:2 reserved
* 0 Single-bit DRAM ECC Error Flag (DSERR) * 1 Multi-bit DRAM ECC Error Flag (DMERR)
*/ * 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 */
#define I3000_ERRSTS_UE 0x0002 #define I3000_ERRSTS_UE 0x0002
#define I3000_ERRSTS_CE 0x0001 #define I3000_ERRSTS_CE 0x0001
#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
* 10 reserved * (TSESERR)
* 9 SERR on LOCK to non-DRAM Memory (LCKERR) * 10 reserved
* 8 SERR on DRAM Refresh Timeout (DRTOERR) * 9 SERR on LOCK to non-DRAM Memory
* 7:2 reserved * (LCKERR)
* 1 SERR Multiple-Bit DRAM ECC Error (DMERR) * 8 SERR on DRAM Refresh Timeout
* 0 SERR on Single-Bit ECC Error (DSERR) * (DRTOERR)
*/ * 7:2 reserved
* 1 SERR Multi-Bit DRAM ECC Error
* (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 */
#define I3000_DRB_SHIFT 25 /* 32MiB grain */ #define I3000_DRB_SHIFT 25 /* 32MiB grain */
#define I3000_C0DRB 0x100 /* Channel 0 DRAM Rank Boundary (8b x 4) #define I3000_C0DRB 0x100 /* Channel 0 DRAM Rank Boundary (8b x 4)
* *
* 7:0 Channel 0 DRAM Rank Boundary Address * 7:0 Channel 0 DRAM Rank Boundary Address
*/ */
#define I3000_C1DRB 0x180 /* Channel 1 DRAM Rank Boundary (8b x 4) #define I3000_C1DRB 0x180 /* Channel 1 DRAM Rank Boundary (8b x 4)
* *
* 7:0 Channel 1 DRAM Rank Boundary Address * 7:0 Channel 1 DRAM Rank Boundary Address
*/ */
#define I3000_C0DRA 0x108 /* Channel 0 DRAM Rank Attribute (8b x 2) #define I3000_C0DRA 0x108 /* Channel 0 DRAM Rank Attribute (8b x 2)
* *
* 7 reserved * 7 reserved
* 6:4 DRAM odd Rank Attribute * 6:4 DRAM odd Rank Attribute
* 3 reserved * 3 reserved
* 2:0 DRAM even Rank Attribute * 2:0 DRAM even Rank Attribute
* *
* Each attribute defines the page * Each attribute defines the page
* size of the corresponding rank: * size of the corresponding rank:
* 000: unpopulated * 000: unpopulated
* 001: reserved * 001: reserved
* 010: 4 KB * 010: 4 KB
* 011: 8 KB * 011: 8 KB
* 100: 16 KB * 100: 16 KB
* Others: reserved * Others: reserved
*/ */
#define I3000_C1DRA 0x188 /* Channel 1 DRAM Rank Attribute (8b x 2) */ #define I3000_C1DRA 0x188 /* Channel 1 DRAM Rank Attribute (8b x 2) */
#define ODD_RANK_ATTRIB(dra) (((dra) & 0x70) >> 4) #define ODD_RANK_ATTRIB(dra) (((dra) & 0x70) >> 4)
#define EVEN_RANK_ATTRIB(dra) ((dra) & 0x07) #define EVEN_RANK_ATTRIB(dra) ((dra) & 0x07)
#define I3000_C0DRC0 0x120 /* DRAM Controller Mode 0 (32b) #define I3000_C0DRC0 0x120 /* DRAM Controller Mode 0 (32b)
* *
* 31:30 reserved * 31:30 reserved
* 29 Initialization Complete (IC) * 29 Initialization Complete (IC)
* 28:11 reserved * 28:11 reserved
* 10:8 Refresh Mode Select (RMS) * 10:8 Refresh Mode Select (RMS)
* 7 reserved * 7 reserved
* 6:4 Mode Select (SMS) * 6:4 Mode Select (SMS)
* 3:2 reserved * 3:2 reserved
* 1:0 DRAM Type (DT) * 1:0 DRAM Type (DT)
*/ */
#define I3000_C0DRC1 0x124 /* DRAM Controller Mode 1 (32b) #define I3000_C0DRC1 0x124 /* DRAM Controller Mode 1 (32b)
* *
* 31 Enhanced Addressing Enable (ENHADE) * 31 Enhanced Addressing Enable (ENHADE)
* 30:0 reserved * 30:0 reserved
*/ */
enum i3000p_chips { enum i3000p_chips {
I3000 = 0, I3000 = 0,
@ -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,
@ -390,7 +402,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
debugf3("MC: %s(): success\n", __func__); debugf3("MC: %s(): success\n", __func__);
return 0; return 0;
fail: fail:
if (mci) if (mci)
edac_mc_free(mci); edac_mc_free(mci);
@ -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);