From 7d0e29a9a4bb5614eec05c73b5f0e5a4a5a9a146 Mon Sep 17 00:00:00 2001 From: ryan_chen Date: Tue, 24 May 2022 17:51:01 +0800 Subject: [PATCH] edac: remove no used code to align with upstream driver Signed-off-by: ryan_chen Change-Id: I7cf803546b71bd626ff6b63bcc1c3d950d5e42ba --- drivers/edac/aspeed_edac.c | 74 +++++--------------------------------- 1 file changed, 8 insertions(+), 66 deletions(-) diff --git a/drivers/edac/aspeed_edac.c b/drivers/edac/aspeed_edac.c index a013454e59f2..6bd5f8815919 100644 --- a/drivers/edac/aspeed_edac.c +++ b/drivers/edac/aspeed_edac.c @@ -20,7 +20,6 @@ #define ASPEED_MCR_PROT 0x00 /* protection key register */ #define ASPEED_MCR_CONF 0x04 /* configuration register */ -#define ASPEED_MCR_REQ 0x08 /* Graphics Memory Protection register */ #define ASPEED_MCR_INTR_CTRL 0x50 /* interrupt control/status register */ #define ASPEED_MCR_ADDR_UNREC 0x58 /* address of first un-recoverable error */ #define ASPEED_MCR_ADDR_REC 0x5c /* address of last recoverable error */ @@ -89,63 +88,6 @@ static const struct regmap_config aspeed_regmap_config = { .fast_io = true, }; -static const u32 ast2400_dram_table[] = { - 0x04000000, //64MB - 0x08000000, //128MB - 0x10000000, //256MB - 0x20000000, //512MB -}; - -static const u32 ast2500_dram_table[] = { - 0x08000000, //128MB - 0x10000000, //256MB - 0x20000000, //512MB - 0x40000000, //1024MB -}; - -static const u32 ast2600_dram_table[] = { - 0x10000000, //256MB - 0x20000000, //512MB - 0x40000000, //1024MB - 0x80000000, //2048MB -}; - -extern u32 aspeed_get_dram_size(void) -{ - u32 reg04; - u32 size; - - regmap_read(aspeed_regmap, ASPEED_MCR_CONF, ®04); - -#if defined(CONFIG_MACH_ASPEED_G6) - size = ast2600_dram_table[reg04 & 0x3]; -#elif defined(CONFIG_MACH_ASPEED_G5) - size = ast2500_dram_table[reg04 & 0x3]; -#else - size = ast2400_dram_table[reg04 & 0x3]; -#endif - return size; -} -EXPORT_SYMBOL(aspeed_get_dram_size); - -static const u32 aspeed_vga_table[] = { - 0x800000, //8MB - 0x1000000, //16MB - 0x2000000, //32MB - 0x4000000, //64MB -}; - -extern u32 aspeed_get_vga_size(void) -{ - u32 reg04; - u32 size; - - regmap_read(aspeed_regmap, ASPEED_MCR_CONF, ®04); - - size = aspeed_vga_table[((reg04 & 0xC) >> 2)]; - return size; -} -EXPORT_SYMBOL(aspeed_get_vga_size); static void count_rec(struct mem_ctl_info *mci, u8 rec_cnt, u32 rec_addr) { @@ -312,7 +254,7 @@ static int init_csrows(struct mem_ctl_info *mci) return rc; } - dev_info(mci->pdev, "dt: /memory node resources: first page %pR, PAGE_SHIFT macro=0x%x\n", + dev_dbg(mci->pdev, "dt: /memory node resources: first page %pR, PAGE_SHIFT macro=0x%x\n", &r, PAGE_SHIFT); csrow->first_page = r.start >> PAGE_SHIFT; @@ -327,7 +269,7 @@ static int init_csrows(struct mem_ctl_info *mci) dimm->edac_mode = EDAC_SECDED; dimm->nr_pages = nr_pages / csrow->nr_channels; - dev_info(mci->pdev, "initialized dimm with first_page=0x%lx and nr_pages=0x%x\n", + dev_dbg(mci->pdev, "initialized dimm with first_page=0x%lx and nr_pages=0x%x\n", csrow->first_page, nr_pages); return 0; @@ -340,7 +282,7 @@ static int aspeed_probe(struct platform_device *pdev) struct edac_mc_layer layers[2]; struct mem_ctl_info *mci; void __iomem *regs; - //u32 reg04; + u32 reg04; int rc; regs = devm_platform_ioremap_resource(pdev, 0); @@ -353,11 +295,11 @@ static int aspeed_probe(struct platform_device *pdev) return PTR_ERR(aspeed_regmap); /* bail out if ECC mode is not configured */ - //regmap_read(aspeed_regmap, ASPEED_MCR_CONF, ®04); - //if (!(reg04 & ASPEED_MCR_CONF_ECC)) { - // dev_err(&pdev->dev, "ECC mode is not configured in u-boot\n"); - // return -EPERM; - //} + regmap_read(aspeed_regmap, ASPEED_MCR_CONF, ®04); + if (!(reg04 & ASPEED_MCR_CONF_ECC)) { + dev_err(&pdev->dev, "ECC mode is not configured in u-boot\n"); + return -EPERM; + } edac_op_state = EDAC_OPSTATE_INT;