Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 695426506ebba6acc87843cca075595a775e8866

Authored by Borislav Petkov
1 parent 935ab88e34
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

amd64_edac: Remove unneeded defines 

All F2x110-related bit defines are used at only one place so replace
them with simple BIT() macros.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Acked-by: Doug Thompson <dougthompson@xmission.com>

Showing 1 changed file with 8 additions and 35 deletions Side-by-side Diff

drivers/edac/amd64_edac.h
Diff comments   View file @ 6954265
... ... @@ -244,43 +244,16 @@
244 244  
245 245  
246 246 #define F10_DCTL_SEL_LOW 0x110
  247 +#define dct_sel_baseaddr(pvt) ((pvt->dram_ctl_select_low) & 0xFFFFF800)
  248 +#define dct_sel_interleave_addr(pvt) (((pvt->dram_ctl_select_low) >> 6) & 0x3)
  249 +#define dct_high_range_enabled(pvt) (pvt->dram_ctl_select_low & BIT(0))
  250 +#define dct_interleave_enabled(pvt) (pvt->dram_ctl_select_low & BIT(2))
  251 +#define dct_ganging_enabled(pvt) (pvt->dram_ctl_select_low & BIT(4))
  252 +#define dct_data_intlv_enabled(pvt) (pvt->dram_ctl_select_low & BIT(5))
  253 +#define dct_dram_enabled(pvt) (pvt->dram_ctl_select_low & BIT(8))
  254 +#define dct_memory_cleared(pvt) (pvt->dram_ctl_select_low & BIT(10))
247 255  
248   -#define dct_sel_baseaddr(pvt) \
249   - ((pvt->dram_ctl_select_low) & 0xFFFFF800)
250   -
251   -#define dct_sel_interleave_addr(pvt) \
252   - (((pvt->dram_ctl_select_low) >> 6) & 0x3)
253   -
254   -enum {
255   - F10_DCTL_SEL_LOW_DctSelHiRngEn = BIT(0),
256   - F10_DCTL_SEL_LOW_DctSelIntLvEn = BIT(2),
257   - F10_DCTL_SEL_LOW_DctGangEn = BIT(4),
258   - F10_DCTL_SEL_LOW_DctDatIntLv = BIT(5),
259   - F10_DCTL_SEL_LOW_DramEnable = BIT(8),
260   - F10_DCTL_SEL_LOW_MemCleared = BIT(10),
261   -};
262   -
263   -#define dct_high_range_enabled(pvt) \
264   - (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_DctSelHiRngEn)
265   -
266   -#define dct_interleave_enabled(pvt) \
267   - (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_DctSelIntLvEn)
268   -
269   -#define dct_ganging_enabled(pvt) \
270   - (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_DctGangEn)
271   -
272   -#define dct_data_intlv_enabled(pvt) \
273   - (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_DctDatIntLv)
274   -
275   -#define dct_dram_enabled(pvt) \
276   - (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_DramEnable)
277   -
278   -#define dct_memory_cleared(pvt) \
279   - (pvt->dram_ctl_select_low & F10_DCTL_SEL_LOW_MemCleared)
280   -
281   -
282 256 #define F10_DCTL_SEL_HIGH 0x114
283   -
284 257  
285 258 /*
286 259 * Function 3 - Misc Control