From patchwork Mon Sep 10 20:41:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 968237 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pgCZk3im"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 428KhZ0SbFz9s3l for ; Tue, 11 Sep 2018 06:41:30 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A3025C21DFB; Mon, 10 Sep 2018 20:41:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D22D5C21C93; Mon, 10 Sep 2018 20:41:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6B6D1C21C93; Mon, 10 Sep 2018 20:41:20 +0000 (UTC) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by lists.denx.de (Postfix) with ESMTPS id C35DDC21C38 for ; Mon, 10 Sep 2018 20:41:19 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id k21-v6so11038902pff.11 for ; Mon, 10 Sep 2018 13:41:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=6yfIHoj4Je7jvYjqXsws/Ys7JSEvng3A2ni4I8Xfm9c=; b=pgCZk3im8lp8MnzCrWmnJX9572ojwcQ4hImxwFTZ0Nj1jWUNoeVnWOkQWIXA3jSf1I sb9XeceeoWtgd1NGbGU3kfGa3xaHWhaCiecPkKJaZxEdEErDWf7d/zcMi3sY16IfagFx SyuGbTlVWtG0mzVbiYfxSy5WF0yubHCArp9NoWRmyNAi9xTRUi6nMlqhwhyPeWVdS0Jv St8iHOr8QkGG/BYAoF3UxOXGlB91XsE4Pkgyawwu5fDFB/aIugwGJFVw5bqH9uEpTFjO c64j9yGuBLRwZmAYtOyKRkVecKZu+PvCh7cq4Aes4g4gmmDQ7vwaPRm6em6Vo/93nJWM tKdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6yfIHoj4Je7jvYjqXsws/Ys7JSEvng3A2ni4I8Xfm9c=; b=Cz6nJzrp3fyW8sYMAVMg+fnj8FDrGQu48qRpEB6Kc2Pa4qqSqbVYYolUyJUGBLVFh7 6sT4Fs8KgQhmwTJCDWLxNygG45GrxG1f1+RTTlJuICVYFkoHq4GPQnCIj9bL7Px5Y94K CEYzfuOVB905gcClQyM2MM8Ddd01R0E06m9E3pcXlytXqw0bkhdGex2ccc9GVjZk3WLv PcWEvH1YlbFcNPVc91gFCIB16O8IkFQ7hPLeFXV4FPX+lylm8NG0sJ6owrfGbtccObWG MlZITTi92JtGmsIdLwk4Lc2LzY494QLf81rPTkZWCDBIxladUlRrfjuddWe4ovkKpAH2 KafQ== X-Gm-Message-State: APzg51BLHECQYQwgaRUYqH4mElCGSHW6WoSNGxFGbz3IPPTLHOcUtA+P ToM/ouT5TOuxdghYnjkhVgYgvpn8 X-Google-Smtp-Source: ANB0VdZsEu+Kh+A8yarJ8qGGszcV7W0nuuc4REtgvs/1ZOqxawazacuwDpX5HB0VJrG6EfdOD4bonA== X-Received: by 2002:a63:fe4d:: with SMTP id x13-v6mr24658331pgj.152.1536612077801; Mon, 10 Sep 2018 13:41:17 -0700 (PDT) Received: from dwesterg-mobl.sn.intel.com ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id y128-v6sm23600786pfb.56.2018.09.10.13.41.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:41:16 -0700 (PDT) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, chin.liang.see@intel.com, tien.fong.chee@intel.com Date: Mon, 10 Sep 2018 13:41:11 -0700 Message-Id: <20180910204111.6842-1-dwesterg@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [U-Boot] [PATCH] socfpga: stratix10: fix sdram_calculate_size X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Incorrect type of size variable results in 0 being returned for sdram sizes greater than or equal to 4GB. Signed-off-by: Dalon Westergreen --- drivers/ddr/altera/sdram_s10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c index 48f4f47b14..dad0147b64 100644 --- a/drivers/ddr/altera/sdram_s10.c +++ b/drivers/ddr/altera/sdram_s10.c @@ -375,7 +375,7 @@ unsigned long sdram_calculate_size(void) { u32 dramaddrw = hmc_readl(DRAMADDRW); - u32 size = 1 << (DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) + + unsigned long size = 1 << (DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) + DRAMADDRW_CFG_BANK_GRP_ADDR_WIDTH(dramaddrw) + DRAMADDRW_CFG_BANK_ADDR_WIDTH(dramaddrw) + DRAMADDRW_CFG_ROW_ADDR_WIDTH(dramaddrw) +