MPC85xx, MPC83xx: Add/Fix UPM configuration support
PATCH 1/1 MPC85xx, MPC83xx: Add/Fix UPM configuration support
Add support for UPM configuration on the 85xx platform.
In addition, on the MPC83xx, remove MPC834x precompiler condition, in order to support all MPC83xx processors.
include/mpc85xx.h +0 -0
@@ -35,7 +35,10 @@#define BRx_MS_UPMA 0x00000080/* U.P.M.A Machine Select
*/
#define BRx_MS_UPMB 0x000000a0 /* U.P.M.B Machine Select
*/
#define BRx_MS_UPMC 0x000000c0 /* U.P.M.C Machine Select
*/
+#define BRx_MS_MSK 0x000000e0 /* Machine select mask */
+#define BRx_MS_SHIFT 5 /* Machine select shift */
#define BRx_PS_8 0x00000800 /* 8 bit port size
*/
+#define BRx_PS_16 0x00001000 /* 16 bit port size
*/
#define BRx_PS_32 0x00001800 /* 32 bit port size
*/
#define BRx_BA_MSK 0xffff8000 /* Base Address Mask
*/
@@ -53,8 +56,10 @@
#define ORxU_AM_MSK 0xffff8000 /* Address Mask Mask
*/
#define MxMR_OP_NORM 0x00000000 /* Normal Operation
*/
-#define MxMR_DSx_2_CYCL 0x00400000 /* 2 cycle Disable Period
*/
#define MxMR_OP_WARR 0x10000000 /* Write to Array
*/
+#define MxMR_DSx_2_CYCL 0x00400000 /* 2 cycle Disable Period
*/
+#define MxMR_DSx_3_CYCL 0x00800000 /* 3 cycle Disable Period
*/
+#define MxMR_GPL4_LPWT 0x00040000 /* LGPL4 Line in LUPWAIT mode
*/
#define MxMR_BSEL 0x80000000 /* Bus Select
*/
/* helpers to convert values into an OR address mask (GPCM mode) */
cpu/mpc83xx/cpu.c +0 -1
@@ -227,7 +227,6 @@ int checkcpu(void)*/ void upmconfig (uint upm,uint *table,uint size) { -#if defined(CONFIG_MPC834X )volatile immap_t *immap = (immap_t *)CFG_IMMR ;volatile lbus83xx_t *lbus = &immap->lbus;volatile uchar *dummy =NULL ;
@@ -260,10 +259,6 @@ void upmconfig (uint upm, uint *table, u/* Set the OP field in the MxMR to "normal" and the MAD field to
000000 */
*mxmr &= 0xCFFFFFC0;
-#else
- printf("Error: %s() not defined for this configuration.\n",__FUNCTION__);
- hang();
-#endif
}
cpu/mpc85xx/cpu.c +34 -0
@@ -29,6 +29,7 @@#include <watchdog.h> #include <command.h> #include <asm/cache.h> +#include "asm/immap_85xx.h" int checkcpu (void ) {
@@ -263,3 +264,68 @@ int dma_xfer(void *dest, uint count, voi return dma_check(); }#endif + +/* +* Program a UPM with the code supplied in the table. +* +* The 'dummy' variable is used to increment the MAD. 'dummy' is +* supposed to be a pointer to the memory of the device being +* programmed by the UPM. The data in the MDR is written into +* memory and the MAD is incremented every time there's a read +* from 'dummy'. Unfortunately, the current prototype for this +* function doesn't allow for passing the address of this +* device, and changing the prototype will break a number lots +* of other code, so we need to use a round-about way of finding +* the value for 'dummy'. +* +* The value can be extracted from the base address bits of the +* Base Register (BR) associated with the specific UPM. To find +* that BR, we need to scan all BRs until we find the one that +* has its MSEL bits matching the UPM we want. Once we know the +* right BR, we can extract the base address bits from it. +* +* The MxMR and the BR and OR of the chosen bank should all be +* configured before calling this function. +* +* Parameters: +* upm: 0=UPMA, 1=UPMB, 2=UPMC +* table: Pointer to an array of values to program +* size: Number of elements in the array. Must be 64 or less. +*/ +void upmconfig (uint upm,uint *table,uint size) +{ +volatile ccsr_lbc_t *lbc = (void *)(CFG_MPC85xx_LBC_ADDR); +volatile uchar *dummy =NULL ; +const u32 msel = (upm +4 ) << BRx_MS_SHIFT;/* What the MSEL
field in BRn should be */
+ volatile uint *mxmr = &lbc->mamr + upm; /* Pointer to mamr,
mbmr, or mcmr */
+ volatile uint *brx = &lbc->br0; /* Pointer to BRx */
+ uint i;
+
+ /* Scan all the banks to determine the base address of the
device */
+ for (i = 0; i < 8; i++) {
+ if ((*brx & BRx_MS_MSK) == msel) {
+ dummy = (uchar *) (*brx & BRx_BA_MSK);
+ break;
+ }
+ brx += 2; /* Skip to next BRx */
+ }
+
+ if (!dummy) {
+ printf("Error: %s() could not find matching BR\n",__FUNCTION__);
+ hang();
+ }
+
+ /* Set the OP field in the MxMR to "write" and the MAD field to
000000 */
+ *mxmr = (*mxmr & 0xCFFFFFC0) | MxMR_OP_WARR;
+
+ for (i = 0; i < size; i++) {
+ lbc->mdr = table[i];
+ __asm__ __volatile__ ("sync");
+ *dummy; /* Write the value to memory and increment MAD
*/
+ __asm__ __volatile__ ("sync");
+ }
+
+ /* Set the OP field in the MxMR to "normal" and the MAD field to
000000 */
+ *mxmr &= 0xCFFFFFC0;
+}
+
PATCH 1/1 MPC85xx, MPC83xx: Add/Fix UPM configuration support
include/mpc85xx.h line 36
Quoted 11 lines · In message <[email protected]> you…
Add support for UPM configuration on the 85xx platform.
In addition, on the MPC83xx, remove MPC834x precompiler condition, in order to support all MPC83xx processors.Signed-off-by David Saada <[email protected]>include/mpc85xx.h +0
-0@@ -35,7 +35,10 @@#define BRx_MS_UPMA 0x00000080/* U.P.M.A Machine Select */
^^^^^^
include/mpc85xx.h line 38
Quoted 2 lines
include/mpc85xx.h +0
-0#define BRx_MS_UPMB 0x000000a0/* U.P.M.B Machine Select */
^^^^^^
include/mpc85xx.h line 40
Quoted 2 lines
include/mpc85xx.h +0
-0#define BRx_MS_UPMC 0x000000c0/* U.P.M.C Machine Select */
^^^^^^
Quoted 4 lines
include/mpc85xx.h +2
-0+#define BRx_MS_MSK 0x000000e0/* Machine select mask */ +#define BRx_MS_SHIFT 5/* Machine select shift */ #define BRx_PS_8 0x00000800/* 8 bit port size */
^^^^^^
Quoted 2 lines
+#define
BRx_PS_160x00001000/* 16 bit port size
*/
^^^^^^
etc. Your patch is line-wrapped. Please fix your mailer setupo before resubmitting.
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "I believe the use of noise to make music will increase until we reach a music produced through the aid of electrical instruments which will make available for musical purposes any and all sounds that can be heard." - composer John Cage, 1937