minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 03:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

ppc4xx: Cleanup of "ppc4xx: Optimize PLB4 Arbiter..." patch

Browse Source 
This patch fixes some minor issues introduced with the patch:
ppc4xx: Optimize PLB4 Arbiter... from Prodyut Hazarika:

- Rework memory-queue and PLB arbiter optimization code, that the
  local variable is not needed anymore. This removes one #ifdef.
- Use consistant spacing in ppc4xx.h header (XXX + 0x01 instead
  of XXX+ 0x01). This was not introduced by Prodyut, just a
  copy-paste problem.

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2008-08-21 11:05:03 +02:00
parent 079589bcfb
commit f556483734
3 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cpu/ppc4xx/44x_spd_ddr2.c
View File

@ -2172,11 +2172,6 @@ static void program_memory_queue(unsigned long *dimm_populated,
unsigned long i; unsigned long i;
unsigned long bank_0_populated = 0; unsigned long bank_0_populated = 0;
phys_size_t total_size = 0; phys_size_t total_size = 0;
#if defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_460SX)
unsigned long val;
#endif
/*------------------------------------------------------------------ /*------------------------------------------------------------------
* Reset the rank_base_address. * Reset the rank_base_address.
@ -2257,7 +2252,6 @@ static void program_memory_queue(unsigned long *dimm_populated,
#if defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ #if defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_460SX) defined(CONFIG_460SX)
/* /*
* Enable high bandwidth access * Enable high bandwidth access
* This is currently not used, but with this setup * This is currently not used, but with this setup
@ -2270,15 +2264,11 @@ static void program_memory_queue(unsigned long *dimm_populated,
/* /*
* Set optimal value for Memory Queue HB/LL Configuration registers * Set optimal value for Memory Queue HB/LL Configuration registers
*/ */
mtdcr(SDRAM_CONF1HB, mfdcr(SDRAM_CONF1HB) | SDRAM_CONF1HB_AAFR |
val = (mfdcr(SDRAM_CONF1HB) | SDRAM_CONF1HB_AAFR | SDRAM_CONF1HB_RPEN | SDRAM_CONF1HB_RFTE); SDRAM_CONF1HB_RPEN | SDRAM_CONF1HB_RFTE);
mtdcr(SDRAM_CONF1HB, val); mtdcr(SDRAM_CONF1LL, mfdcr(SDRAM_CONF1LL) | SDRAM_CONF1LL_AAFR |
SDRAM_CONF1LL_RPEN | SDRAM_CONF1LL_RFTE);
val = (mfdcr(SDRAM_CONF1LL) | SDRAM_CONF1LL_AAFR | SDRAM_CONF1LL_RPEN | SDRAM_CONF1LL_RFTE); mtdcr(SDRAM_CONFPATHB, mfdcr(SDRAM_CONFPATHB) | SDRAM_CONFPATHB_TPEN);
mtdcr(SDRAM_CONF1LL, val);
val = (mfdcr(SDRAM_CONFPATHB) | SDRAM_CONFPATHB_TPEN);
mtdcr(SDRAM_CONFPATHB, val);
#endif #endif
} }

17
cpu/ppc4xx/cpu_init.c
View File

@ -138,9 +138,7 @@ void reconfigure_pll(u32 new_cpu_freq)
void void
cpu_init_f (void) cpu_init_f (void)
{ {
#if defined(CONFIG_WATCHDOG) || defined(CONFIG_440GX) || defined(CONFIG_460EX) || \ #if defined(CONFIG_WATCHDOG) || defined(CONFIG_440GX) || defined(CONFIG_460EX)
defined(CONFIG_440SP) || defined(CONFIG_440SPE) || defined(CONFIG_405EX) || \
defined(CONFIG_460GT) || defined(CONFIG_460SX)
u32 val; u32 val;
#endif #endif
@ -304,16 +302,17 @@ cpu_init_f (void)
mtsdr(SDR0_USB2HOST_CFG, val); mtsdr(SDR0_USB2HOST_CFG, val);
#endif /* CONFIG_460EX */ #endif /* CONFIG_460EX */
#if defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ #if defined(CONFIG_405EX) || \
defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_405EX) || defined(CONFIG_460SX) defined(CONFIG_460SX)
/* /*
* Set PLB4 arbiter (Segment 0 and 1) to 4 deep pipeline read * Set PLB4 arbiter (Segment 0 and 1) to 4 deep pipeline read
*/ */
val = (mfdcr(plb0_acr) & ~plb0_acr_rdp_mask) | plb0_acr_rdp_4deep; mtdcr(plb0_acr, (mfdcr(plb0_acr) & ~plb0_acr_rdp_mask) |
mtdcr(plb0_acr, val); plb0_acr_rdp_4deep);
val = (mfdcr(plb1_acr) & ~plb1_acr_rdp_mask) | plb1_acr_rdp_4deep; mtdcr(plb1_acr, (mfdcr(plb1_acr) & ~plb1_acr_rdp_mask) |
mtdcr(plb1_acr, val); plb1_acr_rdp_4deep);
#endif /* CONFIG_440SP/SPE || CONFIG_460EX/GT || CONFIG_405EX */ #endif /* CONFIG_440SP/SPE || CONFIG_460EX/GT || CONFIG_405EX */
} }

24
include/ppc4xx.h
View File

@ -56,8 +56,8 @@
#define PLB_ARBITER_BASE 0x80 #define PLB_ARBITER_BASE 0x80
#define plb0_revid (PLB_ARBITER_BASE+ 0x00) #define plb0_revid (PLB_ARBITER_BASE + 0x00)
#define plb0_acr (PLB_ARBITER_BASE+ 0x01) #define plb0_acr (PLB_ARBITER_BASE + 0x01)
#define plb0_acr_ppm_mask 0xF0000000 #define plb0_acr_ppm_mask 0xF0000000
#define plb0_acr_ppm_fixed 0x00000000 #define plb0_acr_ppm_fixed 0x00000000
#define plb0_acr_ppm_fair 0xD0000000 #define plb0_acr_ppm_fair 0xD0000000
@ -73,13 +73,13 @@
#define plb0_acr_wrp_disabled 0x00000000 #define plb0_acr_wrp_disabled 0x00000000
#define plb0_acr_wrp_2deep 0x01000000 #define plb0_acr_wrp_2deep 0x01000000
#define plb0_besrl (PLB_ARBITER_BASE+ 0x02) #define plb0_besrl (PLB_ARBITER_BASE + 0x02)
#define plb0_besrh (PLB_ARBITER_BASE+ 0x03) #define plb0_besrh (PLB_ARBITER_BASE + 0x03)
#define plb0_bearl (PLB_ARBITER_BASE+ 0x04) #define plb0_bearl (PLB_ARBITER_BASE + 0x04)
#define plb0_bearh (PLB_ARBITER_BASE+ 0x05) #define plb0_bearh (PLB_ARBITER_BASE + 0x05)
#define plb0_ccr (PLB_ARBITER_BASE+ 0x08) #define plb0_ccr (PLB_ARBITER_BASE + 0x08)
#define plb1_acr (PLB_ARBITER_BASE+ 0x09) #define plb1_acr (PLB_ARBITER_BASE + 0x09)
#define plb1_acr_ppm_mask 0xF0000000 #define plb1_acr_ppm_mask 0xF0000000
#define plb1_acr_ppm_fixed 0x00000000 #define plb1_acr_ppm_fixed 0x00000000
#define plb1_acr_ppm_fair 0xD0000000 #define plb1_acr_ppm_fair 0xD0000000
@ -95,10 +95,10 @@
#define plb1_acr_wrp_disabled 0x00000000 #define plb1_acr_wrp_disabled 0x00000000
#define plb1_acr_wrp_2deep 0x01000000 #define plb1_acr_wrp_2deep 0x01000000
#define plb1_besrl (PLB_ARBITER_BASE+ 0x0A) #define plb1_besrl (PLB_ARBITER_BASE + 0x0A)
#define plb1_besrh (PLB_ARBITER_BASE+ 0x0B) #define plb1_besrh (PLB_ARBITER_BASE + 0x0B)
#define plb1_bearl (PLB_ARBITER_BASE+ 0x0C) #define plb1_bearl (PLB_ARBITER_BASE + 0x0C)
#define plb1_bearh (PLB_ARBITER_BASE+ 0x0D) #define plb1_bearh (PLB_ARBITER_BASE + 0x0D)
#endif /* 440EP/EPX 440GR/GRX 440SP/SPE 460EX/GT/SX 405EX*/ #endif /* 440EP/EPX 440GR/GRX 440SP/SPE 460EX/GT/SX 405EX*/