From 79d696fc558b2bcdb8aa8dc6cd7e4ccd22008e21 Mon Sep 17 00:00:00 2001 From: wdenk Date: Thu, 11 Mar 2004 22:46:36 +0000 Subject: Fix LOWBOOT configuration for MPC5200 with DDR memory --- CHANGELOG | 2 + Makefile | 3 +- cpu/mpc5xxx/start.S | 33 ++++----- cpu/mpc5xxx/usb_ohci.c | 12 ++-- drivers/inca-ip_sw.c | 189 ++++++++++++++++++++++++------------------------- 5 files changed, 120 insertions(+), 119 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0a130aa7ba..aa6bfe5acf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes for U-Boot 1.0.2: ====================================================================== +* Fix LOWBOOT configuration for MPC5200 with DDR memory + * Fix SDRAM timings for LITE5200 / IceCube board * Handle Auti-MDIX / connection status for INCA-IP diff --git a/Makefile b/Makefile index 8c822c6def..b10acbb6e1 100644 --- a/Makefile +++ b/Makefile @@ -207,9 +207,10 @@ PATI_config:unconfig MPC5200LITE_config \ MPC5200LITE_LOWBOOT_config \ MPC5200LITE_LOWBOOT08_config \ -icecube_5200_DDR_LOWBOOT_config \ icecube_5200_DDR_config \ IceCube_5200_DDR_config \ +icecube_5200_DDR_LOWBOOT_config \ +icecube_5200_DDR_LOWBOOT08_config \ icecube_5200_config \ IceCube_5200_config \ IceCube_5100_config: unconfig diff --git a/cpu/mpc5xxx/start.S b/cpu/mpc5xxx/start.S index a1631f49a4..559c7f415a 100644 --- a/cpu/mpc5xxx/start.S +++ b/cpu/mpc5xxx/start.S @@ -108,18 +108,19 @@ boot_warm: #error CFG_LOWBOOT is incompatible with CFG_RAMBOOT #endif /* CFG_RAMBOOT */ lis r4, CFG_DEFAULT_MBAR@h - lis r3, 0x0000FF00@h - ori r3, r3, 0x0000FF00@l - stw r3, 0x4(r4) - lis r3, 0x0000FFFF@h - ori r3, r3, 0x0000FFFF@l - stw r3, 0x8(r4) + lis r3, START_REG(CFG_BOOTCS_START)@h + ori r3, r3, START_REG(CFG_BOOTCS_START)@l + stw r3, 0x4(r4) /* CS0 start */ + lis r3, STOP_REG(CFG_BOOTCS_START, CFG_BOOTCS_SIZE)@h + ori r3, r3, STOP_REG(CFG_BOOTCS_START, CFG_BOOTCS_SIZE)@l + + stw r3, 0x8(r4) /* CS0 stop */ lis r3, 0x00047800@h ori r3, r3, 0x00047800@l - stw r3, 0x300(r4) + stw r3, 0x300(r4) /* set timing, CS0/boot conf reg */ lis r3, 0x02010000@h ori r3, r3, 0x02010000@l - stw r3, 0x54(r4) + stw r3, 0x54(r4) /* CS0 and Boot enable, IPBI ctrl reg */ lis r3, lowboot_reentry@h ori r3, r3, lowboot_reentry@l @@ -127,18 +128,18 @@ boot_warm: blr /* jump to flash based address */ lowboot_reentry: - lis r3, 0x0000FF00@h - ori r3, r3, 0x0000FF00@l - stw r3, 0x4c(r4) - lis r3, 0x0000FFFF@h - ori r3, r3, 0x0000FFFF@l - stw r3, 0x50(r4) + lis r3, START_REG(CFG_BOOTCS_START)@h + ori r3, r3, START_REG(CFG_BOOTCS_START)@l + stw r3, 0x4c(r4) /* Boot start */ + lis r3, STOP_REG(CFG_BOOTCS_START, CFG_BOOTCS_SIZE)@h + ori r3, r3, STOP_REG(CFG_BOOTCS_START, CFG_BOOTCS_SIZE)@l + stw r3, 0x50(r4) /* Boot stop */ lis r3, 0x00047800@h ori r3, r3, 0x00047800@l - stw r3, 0x300(r4) + stw r3, 0x300(r4) /* set timing, CS0/boot conf reg */ lis r3, 0x02000001@h ori r3, r3, 0x02000001@l - stw r3, 0x54(r4) + stw r3, 0x54(r4) /* Boot enable, CS0 disable, wait state enable */ #endif /* CFG_LOWBOOT */ #if defined(CFG_DEFAULT_MBAR) && !defined(CFG_RAMBOOT) diff --git a/cpu/mpc5xxx/usb_ohci.c b/cpu/mpc5xxx/usb_ohci.c index 5b5eac2084..5fcb376c13 100644 --- a/cpu/mpc5xxx/usb_ohci.c +++ b/cpu/mpc5xxx/usb_ohci.c @@ -488,7 +488,7 @@ static int ep_link (ohci_t *ohci, ed_t *edi) if (ohci->ed_controltail == NULL) { writel (ed, &ohci->regs->ed_controlhead); } else { - ohci->ed_controltail->hwNextED = ohci_cpu_to_le32 (ed); + ohci->ed_controltail->hwNextED = ohci_cpu_to_le32 ((unsigned long)ed); } ed->ed_prev = ohci->ed_controltail; if (!ohci->ed_controltail && !ohci->ed_rm_list[0] && @@ -504,7 +504,7 @@ static int ep_link (ohci_t *ohci, ed_t *edi) if (ohci->ed_bulktail == NULL) { writel (ed, &ohci->regs->ed_bulkhead); } else { - ohci->ed_bulktail->hwNextED = ohci_cpu_to_le32 (ed); + ohci->ed_bulktail->hwNextED = ohci_cpu_to_le32 ((unsigned long)ed); } ed->ed_prev = ohci->ed_bulktail; if (!ohci->ed_bulktail && !ohci->ed_rm_list[0] && @@ -598,7 +598,7 @@ static ed_t * ep_add_ed (struct usb_device *usb_dev, unsigned long pipe) ed->hwINFO = ohci_cpu_to_le32 (OHCI_ED_SKIP); /* skip ed */ /* dummy td; end of td list for ed */ td = td_alloc (usb_dev); - ed->hwTailP = ohci_cpu_to_le32 (td); + ed->hwTailP = ohci_cpu_to_le32 ((unsigned long)td); ed->hwHeadP = ed->hwTailP; ed->state = ED_UNLINK; ed->type = usb_pipetype (pipe); @@ -656,12 +656,12 @@ static void td_fill (ohci_t *ohci, unsigned int info, data = 0; td->hwINFO = ohci_cpu_to_le32 (info); - td->hwCBP = ohci_cpu_to_le32 (data); + td->hwCBP = ohci_cpu_to_le32 ((unsigned long)data); if (data) - td->hwBE = ohci_cpu_to_le32 (data + len - 1); + td->hwBE = ohci_cpu_to_le32 ((unsigned long)(data + len - 1)); else td->hwBE = 0; - td->hwNextTD = ohci_cpu_to_le32 (td_pt); + td->hwNextTD = ohci_cpu_to_le32 ((unsigned long)td_pt); td->hwPSW [0] = ohci_cpu_to_le16 (((__u32)data & 0x0FFF) | 0xE000); /* append to queue */ diff --git a/drivers/inca-ip_sw.c b/drivers/inca-ip_sw.c index 3b6397da50..f8fe52ea26 100644 --- a/drivers/inca-ip_sw.c +++ b/drivers/inca-ip_sw.c @@ -14,7 +14,7 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -45,27 +45,27 @@ #define DMA_WRITE_REG(reg, value) *((volatile u32 *)reg) = (u32)value; #define DMA_READ_REG(reg, value) value = (u32)*((volatile u32*)reg) #define SW_WRITE_REG(reg, value) \ - *((volatile u32*)reg) = (u32)value;\ - DELAY;\ - *((volatile u32*)reg) = (u32)value; + *((volatile u32*)reg) = (u32)value;\ + DELAY;\ + *((volatile u32*)reg) = (u32)value; -#define SW_READ_REG(reg, value) \ - value = (u32)*((volatile u32*)reg);\ - DELAY;\ - value = (u32)*((volatile u32*)reg); +#define SW_READ_REG(reg, value) \ + value = (u32)*((volatile u32*)reg);\ + DELAY;\ + value = (u32)*((volatile u32*)reg); -#define INCA_DMA_TX_POLLING_TIME 0x07 -#define INCA_DMA_RX_POLLING_TIME 0x07 +#define INCA_DMA_TX_POLLING_TIME 0x07 +#define INCA_DMA_RX_POLLING_TIME 0x07 -#define INCA_DMA_TX_HOLD 0x80000000 -#define INCA_DMA_TX_EOP 0x40000000 -#define INCA_DMA_TX_SOP 0x20000000 -#define INCA_DMA_TX_ICPT 0x10000000 -#define INCA_DMA_TX_IEOP 0x08000000 +#define INCA_DMA_TX_HOLD 0x80000000 +#define INCA_DMA_TX_EOP 0x40000000 +#define INCA_DMA_TX_SOP 0x20000000 +#define INCA_DMA_TX_ICPT 0x10000000 +#define INCA_DMA_TX_IEOP 0x08000000 -#define INCA_DMA_RX_C 0x80000000 -#define INCA_DMA_RX_SOP 0x40000000 -#define INCA_DMA_RX_EOP 0x20000000 +#define INCA_DMA_RX_C 0x80000000 +#define INCA_DMA_RX_SOP 0x40000000 +#define INCA_DMA_RX_EOP 0x20000000 #define INCA_SWITCH_PHY_SPEED_10H 0x1 #define INCA_SWITCH_PHY_SPEED_10F 0x5 @@ -73,26 +73,26 @@ #define INCA_SWITCH_PHY_SPEED_100F 0x6 /************************ Auto MDIX settings ************************/ -#define INCA_IP_AUTO_MDIX_LAN_PORTS_DIR INCA_IP_Ports_P1_DIR -#define INCA_IP_AUTO_MDIX_LAN_PORTS_ALTSEL INCA_IP_Ports_P1_ALTSEL -#define INCA_IP_AUTO_MDIX_LAN_PORTS_OUT INCA_IP_Ports_P1_OUT -#define INCA_IP_AUTO_MDIX_LAN_GPIO_PIN_RXTX 16 - -#define WAIT_SIGNAL_RETRIES 100 -#define WAIT_LINK_RETRIES 100 -#define LINK_RETRY_DELAY 300 /* ms */ +#define INCA_IP_AUTO_MDIX_LAN_PORTS_DIR INCA_IP_Ports_P1_DIR +#define INCA_IP_AUTO_MDIX_LAN_PORTS_ALTSEL INCA_IP_Ports_P1_ALTSEL +#define INCA_IP_AUTO_MDIX_LAN_PORTS_OUT INCA_IP_Ports_P1_OUT +#define INCA_IP_AUTO_MDIX_LAN_GPIO_PIN_RXTX 16 + +#define WAIT_SIGNAL_RETRIES 100 +#define WAIT_LINK_RETRIES 100 +#define LINK_RETRY_DELAY 2000 /* ms */ /********************************************************************/ typedef struct { union { struct { - volatile u32 HOLD :1; - volatile u32 ICpt :1; - volatile u32 IEop :1; - volatile u32 offset :3; - volatile u32 reserved0 :4; - volatile u32 NFB :22; + volatile u32 HOLD :1; + volatile u32 ICpt :1; + volatile u32 IEop :1; + volatile u32 offset :3; + volatile u32 reserved0 :4; + volatile u32 NFB :22; }field; volatile u32 word; @@ -104,11 +104,11 @@ typedef struct union { struct { - volatile u32 C :1; - volatile u32 Sop :1; - volatile u32 Eop :1; - volatile u32 reserved3 :12; - volatile u32 NBT :17; + volatile u32 C :1; + volatile u32 Sop :1; + volatile u32 Eop :1; + volatile u32 reserved3 :12; + volatile u32 NBT :17; }field; volatile u32 word; @@ -121,13 +121,13 @@ typedef struct { union { struct { - volatile u32 HOLD :1; - volatile u32 Eop :1; - volatile u32 Sop :1; - volatile u32 ICpt :1; - volatile u32 IEop :1; - volatile u32 reserved0 :5; - volatile u32 NBA :22; + volatile u32 HOLD :1; + volatile u32 Eop :1; + volatile u32 Sop :1; + volatile u32 ICpt :1; + volatile u32 IEop :1; + volatile u32 reserved0 :5; + volatile u32 NBA :22; }field; volatile u32 word; @@ -137,8 +137,8 @@ typedef struct volatile u32 TxDataPtr; - volatile u32 C :1; - volatile u32 reserved3 :31; + volatile u32 C :1; + volatile u32 reserved3 :31; } inca_tx_descriptor_t; @@ -148,12 +148,11 @@ static inca_tx_descriptor_t tx_ring[NUM_TX_DESC] __attribute__ ((aligned(16))); static int tx_new, rx_new, tx_hold, rx_hold; static int tx_old_hold = -1; -static int initialized = 0; +static int initialized = 0; static int inca_switch_init(struct eth_device *dev, bd_t * bis); -static int inca_switch_send(struct eth_device *dev, volatile void *packet, - int length); +static int inca_switch_send(struct eth_device *dev, volatile void *packet, int length); static int inca_switch_recv(struct eth_device *dev); static void inca_switch_halt(struct eth_device *dev); static void inca_init_switch_chip(void); @@ -265,9 +264,9 @@ static int inca_switch_init(struct eth_device *dev, bd_t * bis) memset(tx_desc, 0, sizeof(tx_ring[i])); - tx_desc->params.word = 0; + tx_desc->params.word = 0; tx_desc->params.field.HOLD = 1; - tx_desc->C = 1; + tx_desc->C = 1; /* Check if it is the last descriptor. */ @@ -296,8 +295,7 @@ static int inca_switch_init(struct eth_device *dev, bd_t * bis) /* Writing to the COMMAND REG. */ - DMA_WRITE_REG(INCA_IP_DMA_DMA_RXCCR0, - INCA_IP_DMA_DMA_RXCCR0_INIT); + DMA_WRITE_REG(INCA_IP_DMA_DMA_RXCCR0, INCA_IP_DMA_DMA_RXCCR0_INIT); /* Initialize TxDMA. */ @@ -320,9 +318,9 @@ static int inca_switch_init(struct eth_device *dev, bd_t * bis) #endif /* enable spanning tree forwarding, enable the CPU port */ /* ST_PT: - * CPS (CPU port status) 0x3 (forwarding) - * LPS (LAN port status) 0x3 (forwarding) - * PPS (PC port status) 0x3 (forwarding) + * CPS (CPU port status) 0x3 (forwarding) + * LPS (LAN port status) 0x3 (forwarding) + * PPS (PC port status) 0x3 (forwarding) */ SW_WRITE_REG(INCA_IP_Switch_ST_PT,0x3f); @@ -336,11 +334,11 @@ static int inca_switch_init(struct eth_device *dev, bd_t * bis) static int inca_switch_send(struct eth_device *dev, volatile void *packet, int length) { - int i; - int res = -1; - u32 command; - u32 regValue; - inca_tx_descriptor_t * tx_desc = KSEG1ADDR(&tx_ring[tx_new]); + int i; + int res = -1; + u32 command; + u32 regValue; + inca_tx_descriptor_t * tx_desc = KSEG1ADDR(&tx_ring[tx_new]); #if 0 printf("Entered inca_switch_send()\n"); @@ -373,7 +371,7 @@ static int inca_switch_send(struct eth_device *dev, volatile void *packet, int l KSEG1ADDR(&tx_ring[tx_hold])->params.field.HOLD = 0; tx_hold = tx_new; - tx_new = (tx_new + 1) % NUM_TX_DESC; + tx_new = (tx_new + 1) % NUM_TX_DESC; if (! initialized) { @@ -409,7 +407,7 @@ Done: static int inca_switch_recv(struct eth_device *dev) { - int length = 0; + int length = 0; inca_rx_descriptor_t * rx_desc; #if 0 @@ -450,8 +448,7 @@ static int inca_switch_recv(struct eth_device *dev) #if 0 printf("Received %d bytes\n", length); #endif - NetReceive((void*)KSEG1ADDR(NetRxPackets[rx_new]), - length - 4); + NetReceive((void*)KSEG1ADDR(NetRxPackets[rx_new]), length - 4); } else { #if 1 printf("Zero length!!!\n"); @@ -516,13 +513,13 @@ static void inca_init_switch_chip(void) #if 1 /* init MDIO configuration: - * MDS (Poll speed): 0x01 (4ms) - * PHY_LAN_ADDR: 0x06 - * PHY_PC_ADDR: 0x05 + * MDS (Poll speed): 0x01 (4ms) + * PHY_LAN_ADDR: 0x06 + * PHY_PC_ADDR: 0x05 * UEP (Use External PHY): 0x00 (Internal PHY is used) - * PS (Port Select): 0x00 (PT/UMM for LAN) - * PT (PHY Test): 0x00 (no test mode) - * UMM (Use MDIO Mode): 0x00 (state machine is disabled) + * PS (Port Select): 0x00 (PT/UMM for LAN) + * PT (PHY Test): 0x00 (no test mode) + * UMM (Use MDIO Mode): 0x00 (state machine is disabled) */ SW_WRITE_REG(INCA_IP_Switch_MDIO_CFG, 0x4c50); @@ -540,39 +537,39 @@ static void inca_init_switch_chip(void) /* MDIO_ACC: * RA (Request/Ack) 0x01 (Request) - * RW (Read/Write) 0x01 (Write) - * PHY_ADDR 0x05 (PC) - * REG_ADDR 0x00 (PHY_BCR: basic control register) - * PHY_DATA 0x8000 - * Reset - software reset - * LB (loop back) - normal - * SS (speed select) - 10 Mbit/s + * RW (Read/Write) 0x01 (Write) + * PHY_ADDR 0x05 (PC) + * REG_ADDR 0x00 (PHY_BCR: basic control register) + * PHY_DATA 0x8000 + * Reset - software reset + * LB (loop back) - normal + * SS (speed select) - 10 Mbit/s * ANE (auto neg. enable) - enable - * PD (power down) - normal - * ISO (isolate) - normal + * PD (power down) - normal + * ISO (isolate) - normal * RAN (restart auto neg.) - normal - * DM (duplex mode) - half duplex + * DM (duplex mode) - half duplex * CT (collision test) - enable */ SW_WRITE_REG(INCA_IP_Switch_MDIO_ACC, 0xc0a09000); /* MDIO_ACC: * RA (Request/Ack) 0x01 (Request) - * RW (Read/Write) 0x01 (Write) - * PHY_ADDR 0x06 (LAN) - * REG_ADDR 0x00 (PHY_BCR: basic control register) - * PHY_DATA 0x8000 - * Reset - software reset - * LB (loop back) - normal - * SS (speed select) - 10 Mbit/s + * RW (Read/Write) 0x01 (Write) + * PHY_ADDR 0x06 (LAN) + * REG_ADDR 0x00 (PHY_BCR: basic control register) + * PHY_DATA 0x8000 + * Reset - software reset + * LB (loop back) - normal + * SS (speed select) - 10 Mbit/s * ANE (auto neg. enable) - enable - * PD (power down) - normal - * ISO (isolate) - normal + * PD (power down) - normal + * ISO (isolate) - normal * RAN (restart auto neg.) - normal - * DM (duplex mode) - half duplex + * DM (duplex mode) - half duplex * CT (collision test) - enable */ - SW_WRITE_REG(INCA_IP_Switch_MDIO_ACC, 0xc0c09000); + SW_WRITE_REG(INCA_IP_Switch_MDIO_ACC, 0xc0c09000); #endif @@ -723,7 +720,7 @@ static int inca_amdix(void) (0x6 << 21) | /* LAN */ (31 << 16)); /* PHY_SCSR */ do { - SW_READ_REG(INCA_IP_Switch_MDIO_ACC, phyReg31); + SW_READ_REG(INCA_IP_Switch_MDIO_ACC, phyReg31); } while (phyReg31 & (1 << 31)); switch ((phyReg31 >> 2) & 0x7) { @@ -755,7 +752,7 @@ static int inca_amdix(void) (0x6 << 21) | /* LAN */ (6 << 16)); /* PHY_ANER */ do { - SW_READ_REG(INCA_IP_Switch_MDIO_ACC, phyReg6); + SW_READ_REG(INCA_IP_Switch_MDIO_ACC, phyReg6); } while (phyReg6 & (1 << 31)); /* We are Autoneg-able. @@ -768,7 +765,7 @@ static int inca_amdix(void) (0x6 << 21) | /* LAN */ (4 << 16)); /* PHY_ANAR */ do { - SW_READ_REG(INCA_IP_Switch_MDIO_ACC, phyReg4); + SW_READ_REG(INCA_IP_Switch_MDIO_ACC, phyReg4); } while (phyReg4 & (1 << 31)); /* We advertise PAUSE capab. @@ -781,7 +778,7 @@ static int inca_amdix(void) (0x6 << 21) | /* LAN */ (5 << 16)); /* PHY_ANLPAR */ do { - SW_READ_REG(INCA_IP_Switch_MDIO_ACC, phyReg5); + SW_READ_REG(INCA_IP_Switch_MDIO_ACC, phyReg5); } while (phyReg5 & (1 << 31)); /* Link partner is PAUSE capab. -- cgit v1.2.3