From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from elasmtp-kukur.atl.sa.earthlink.net (elasmtp-kukur.atl.sa.earthlink.net [209.86.89.65]) by ozlabs.org (Postfix) with ESMTP id BFD74DDEFA for ; Wed, 28 Mar 2007 00:46:19 +1000 (EST) Message-ID: <46092E32.2060501@mindspring.com> Date: Tue, 27 Mar 2007 10:46:10 -0400 From: Chuck Meade MIME-Version: 1.0 To: galak@kernel.crashing.org Subject: [PATCH] Fix QUICC Engine SDMA setup errors Content-Type: text/plain; charset=ISO-8859-1; format=flowed Cc: linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Correct the alignment of the internal buffer used by the QUICC Engine SDMA controller to 4Kbytes. Correct the shift direction in the logic that sets up the SDMR register for the QUICC Engine SDMA controller. Signed-off-by: Chuck Meade --- In addition to fixing the bugs, this version of this patch addresses Segher's concerns about fixing the line break placement. It also addresses Leo's concerns about using the more accurate term "QUICC Engine" rather than "MPC83xx" in the subject and header. arch/powerpc/sysdev/qe_lib/qe.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -uprN a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c --- a/arch/powerpc/sysdev/qe_lib/qe.c 2007-01-13 09:37:03.000000000 -0500 +++ b/arch/powerpc/sysdev/qe_lib/qe.c 2007-03-27 09:51:23.000000000 -0400 @@ -251,13 +251,13 @@ static int qe_sdma_init(void) /* allocate 2 internal temporary buffers (512 bytes size each) for * the SDMA */ - sdma_buf_offset = qe_muram_alloc(512 * 2, 64); + sdma_buf_offset = qe_muram_alloc(512 * 2, 4096); if (IS_MURAM_ERR(sdma_buf_offset)) return -ENOMEM; out_be32(&sdma->sdebcr, sdma_buf_offset & QE_SDEBCR_BA_MASK); - out_be32(&sdma->sdmr, (QE_SDMR_GLB_1_MSK | (0x1 >> - QE_SDMR_CEN_SHIFT))); + out_be32(&sdma->sdmr, (QE_SDMR_GLB_1_MSK | + (0x1 << QE_SDMR_CEN_SHIFT))); return 0; }