From patchwork Tue Aug 23 13:23:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 111109 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id C6BEDB75DE for ; Tue, 23 Aug 2011 23:24:00 +1000 (EST) Received: from gw1.transmode.se (gw1.transmode.se [195.58.98.146]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F0C62B6F9D for ; Tue, 23 Aug 2011 23:23:51 +1000 (EST) Received: from mail1.transmode.se (mail1.transmode.se [192.168.201.18]) by gw1.transmode.se (Postfix) with ESMTP id 06B2725803F; Tue, 23 Aug 2011 15:23:48 +0200 (CEST) In-Reply-To: <20110823130253.GA30733@oksana.dev.rtsoft.ru> References: <1314103121-9857-1-git-send-email-Joakim.Tjernlund@transmode.se> <20110823130253.GA30733@oksana.dev.rtsoft.ru> Subject: Re: [PATCH] usb: Allocate pram dynamically. X-KeepSent: E326D207:0B9CB598-C12578F5:0049522F; type=4; name=$KeepSent To: Anton Vorontsov , Greg Kroah-Hartman X-Mailer: Lotus Notes Release 8.5.2FP3 Aug 10, 2010 Message-ID: From: Joakim Tjernlund Date: Tue, 23 Aug 2011 15:23:46 +0200 X-MIMETrack: Serialize by Router on mail1/Transmode(Release 8.5.2FP3|July 10, 2011) at 08/23/2011 15:23:47 MIME-Version: 1.0 Cc: linux-usb@vger.kernel.org, linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Anton Vorontsov wrote on 2011/08/23 15:02:53: > From: Anton Vorontsov > To: Joakim Tjernlund > Cc: linuxppc-dev@lists.ozlabs.org > Date: 2011/08/23 15:02 > Subject: Re: [PATCH] usb: Allocate pram dynamically. > > On Tue, Aug 23, 2011 at 02:38:41PM +0200, Joakim Tjernlund wrote: > > MPC832x does not have enough MURAM to do fixed MURAM allocation. > > Change to dynamic allocation. > > > > Signed-off-by: Joakim Tjernlund > > Acked-by: Anton Vorontsov > > Thanks! > > p.s. You probably want to send this to Greg KH, + Cc linux-usb > mailing list. Added linux-usb and Greg KH per Antons suggestion. Jocke From 587137e365ac1ba7e333a09962b3e4b68c587808 Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Tue, 23 Aug 2011 11:04:24 +0200 Subject: [PATCH] usb: Allocate pram dynamically. MPC832x does not have enough MURAM to do fixed MURAM allocation. Change to dynamic allocation. Signed-off-by: Joakim Tjernlund --- drivers/usb/host/fhci-hcd.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) -- 1.7.3.4 diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index c7c8392..98adbe8 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c @@ -622,12 +622,15 @@ static int __devinit of_fhci_probe(struct of_device *ofdev, goto err_pram; } - pram_addr = cpm_muram_alloc_fixed(iprop[2], FHCI_PRAM_SIZE); + pram_addr = cpm_muram_alloc(FHCI_PRAM_SIZE, 64); if (IS_ERR_VALUE(pram_addr)) { dev_err(dev, "failed to allocate usb pram\n"); ret = -ENOMEM; goto err_pram; } + + qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, QE_CR_SUBBLOCK_USB, + QE_CR_PROTOCOL_UNSPECIFIED, pram_addr); fhci->pram = cpm_muram_addr(pram_addr); /* GPIOs and pins */