Message ID | 20190204090124.26191-11-david@gibson.dropbear.id.au |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="erDIriH/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43tMQv4tnLz9sCh for <incoming@patchwork.ozlabs.org>; Mon, 4 Feb 2019 20:11:49 +1100 (AEDT) Received: from localhost ([127.0.0.1]:39039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gqaI7-00088z-9O for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2019 04:11:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1gqa8Z-0000Vb-R3 for qemu-devel@nongnu.org; Mon, 04 Feb 2019 04:01:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1gqa8O-0007Eq-Hr for qemu-devel@nongnu.org; Mon, 04 Feb 2019 04:01:51 -0500 Received: from ozlabs.org ([203.11.71.1]:42685) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1gqa8N-0007Bs-TY; Mon, 04 Feb 2019 04:01:44 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 43tMC63Zx1z9sNp; Mon, 4 Feb 2019 20:01:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1549270898; bh=fbvFBSvQsbr3We+4ojkTIsbWXAOBdh7q13s5FMayFVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=erDIriH/jZcfclUp6G13Kb1kblaRbOJQ5iWyo+LeGwtC76Ymn03GSwrdXhKl57Px8 pXUU23Ybc9xaNvheEUVyWJmQK2M1Q9KWd9dVsw5NBo1kqGMLCa9NzZBze7kqHjOcve 3NQULTBkinoPIVgX2P+RlYTROYf6x5xMlGVW71o0= From: David Gibson <david@gibson.dropbear.id.au> To: peter.maydell@linaro.org Date: Mon, 4 Feb 2019 20:00:57 +1100 Message-Id: <20190204090124.26191-11-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204090124.26191-1-david@gibson.dropbear.id.au> References: <20190204090124.26191-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 10/37] ppc440: Avoid reporting error when reading non-existent RAM slot X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: lvivier@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, spopovyc@redhat.com, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson <david@gibson.dropbear.id.au> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/37] pseries: Update SLOF firmware image
|
expand
|
diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index c489368905..9130eb314c 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -613,8 +613,10 @@ static uint32_t dcr_read_sdram(void *opaque, int dcrn) case SDRAM_R1BAS: case SDRAM_R2BAS: case SDRAM_R3BAS: - ret = sdram_bcr(sdram->ram_bases[dcrn - SDRAM_R0BAS], - sdram->ram_sizes[dcrn - SDRAM_R0BAS]); + if (sdram->ram_sizes[dcrn - SDRAM_R0BAS]) { + ret = sdram_bcr(sdram->ram_bases[dcrn - SDRAM_R0BAS], + sdram->ram_sizes[dcrn - SDRAM_R0BAS]); + } break; case SDRAM_CONF1HB: case SDRAM_CONF1LL: