From patchwork Mon Oct 5 17:41:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Albrecht_Dre=C3=9F?= X-Patchwork-Id: 35038 X-Patchwork-Delegate: grant.likely@secretlab.ca Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id BCF04B7CF7 for ; Tue, 6 Oct 2009 04:41:21 +1100 (EST) Received: by ozlabs.org (Postfix) id 45D03B7BB7; Tue, 6 Oct 2009 04:41:11 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from smtp5.netcologne.de (smtp5.netcologne.de [194.8.194.25]) by ozlabs.org (Postfix) with ESMTP id 92019B7BAC for ; Tue, 6 Oct 2009 04:41:10 +1100 (EST) Received: from antares (xdsl-87-79-190-18.netcologne.de [87.79.190.18]) by smtp5.netcologne.de (Postfix) with ESMTP id 57E6F40D7F0; Mon, 5 Oct 2009 19:41:08 +0200 (CEST) Received: from antares (localhost [127.0.0.1]) by antares (Postfix) with ESMTPS id 16E90BA03E; Mon, 5 Oct 2009 19:41:08 +0200 (CEST) Date: Mon, 05 Oct 2009 19:41:07 +0200 From: Albrecht =?iso-8859-1?b?RHJl3w==?= Subject: [PATCH/v2] powerpc/5200: make BestComm gen_bd microcode exchangeable To: Linux PPC Development , grant.likely@secretlab.ca X-Mailer: Balsa 2.4.1 Message-Id: <1254764467.5503.1@antares> MIME-Version: 1.0 Content-Disposition: inline X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org This patch adds a method for defining different microcodes than the pe-defined ones for the MPC52xx's BestComm General Buffer Descriptor (gen_db) tasks. The default microcode is still the one from bcom_gen_bd_[rt]x_task, but it can be replaced by calling bcom_gen_bd_set_microcode() which is more efficient than explicitly loading it via bcom_load_image() after each bcom_gen_bd_[rt]x_reset(). Except for a fixed tab vs. space formatting and the transfer format, there are no diffierences to the initial attempt. Signed-off-by: Albrecht Dreß diff -uprN -X linux-2.6.32-rc3/Documentation/dontdiff linux-2.6.32-rc3-orig/arch/powerpc/sysdev/bestcomm/gen_bd.c linux-2.6.32-rc3/arch/powerpc/sysdev/bestcomm/gen_bd.c --- linux-2.6.32-rc3-orig/arch/powerpc/sysdev/bestcomm/gen_bd.c 2009-10-05 02:12:30.000000000 +0200 +++ linux-2.6.32-rc3/arch/powerpc/sysdev/bestcomm/gen_bd.c 2009-10-05 14:52:31.000000000 +0200 @@ -78,6 +78,7 @@ struct bcom_gen_bd_priv { int initiator; int ipr; int maxbufsize; + u32 *microcode; }; @@ -104,6 +105,7 @@ bcom_gen_bd_rx_init(int queue_len, phys_ priv->initiator = initiator; priv->ipr = ipr; priv->maxbufsize = maxbufsize; + priv->microcode = bcom_gen_bd_rx_task; if (bcom_gen_bd_rx_reset(tsk)) { bcom_task_free(tsk); @@ -128,7 +130,7 @@ bcom_gen_bd_rx_reset(struct bcom_task *t var = (struct bcom_gen_bd_rx_var *) bcom_task_var(tsk->tasknum); inc = (struct bcom_gen_bd_rx_inc *) bcom_task_inc(tsk->tasknum); - if (bcom_load_image(tsk->tasknum, bcom_gen_bd_rx_task)) + if (bcom_load_image(tsk->tasknum, priv->microcode)) return -1; var->enable = bcom_eng->regs_base + @@ -188,6 +190,7 @@ bcom_gen_bd_tx_init(int queue_len, phys_ priv->fifo = fifo; priv->initiator = initiator; priv->ipr = ipr; + priv->microcode = bcom_gen_bd_tx_task; if (bcom_gen_bd_tx_reset(tsk)) { bcom_task_free(tsk); @@ -212,7 +215,7 @@ bcom_gen_bd_tx_reset(struct bcom_task *t var = (struct bcom_gen_bd_tx_var *) bcom_task_var(tsk->tasknum); inc = (struct bcom_gen_bd_tx_inc *) bcom_task_inc(tsk->tasknum); - if (bcom_load_image(tsk->tasknum, bcom_gen_bd_tx_task)) + if (bcom_load_image(tsk->tasknum, priv->microcode)) return -1; var->enable = bcom_eng->regs_base + @@ -253,6 +256,15 @@ bcom_gen_bd_tx_release(struct bcom_task } EXPORT_SYMBOL_GPL(bcom_gen_bd_tx_release); +void +bcom_gen_bd_set_microcode(struct bcom_task *tsk, u32 *microcode) +{ + struct bcom_gen_bd_priv *priv = tsk->priv; + + priv->microcode = microcode; +} +EXPORT_SYMBOL_GPL(bcom_gen_bd_set_microcode); + /* --------------------------------------------------------------------- * PSC support code */ diff -uprN -X linux-2.6.32-rc3/Documentation/dontdiff linux-2.6.32-rc3-orig/arch/powerpc/sysdev/bestcomm/gen_bd.h linux-2.6.32-rc3/arch/powerpc/sysdev/bestcomm/gen_bd.h --- linux-2.6.32-rc3-orig/arch/powerpc/sysdev/bestcomm/gen_bd.h 2009-10-05 02:12:30.000000000 +0200 +++ linux-2.6.32-rc3/arch/powerpc/sysdev/bestcomm/gen_bd.h 2009-10-05 14:52:31.000000000 +0200 @@ -43,6 +43,9 @@ bcom_gen_bd_tx_reset(struct bcom_task *t extern void bcom_gen_bd_tx_release(struct bcom_task *tsk); +extern void +bcom_gen_bd_set_microcode(struct bcom_task *tsk, u32 *microcode); + /* PSC support utility wrappers */ struct bcom_task * bcom_psc_gen_bd_rx_init(unsigned psc_num, int queue_len,