From patchwork Wed Oct 11 12:43:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 731962 Delivered-To: patch@linaro.org Received: by 2002:a5d:54d1:0:b0:31d:da82:a3b4 with SMTP id x17csp384310wrv; Wed, 11 Oct 2023 05:44:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFVAaKKoDZDG1iZfsyavzvhI+gJcPCtuBwla5sMPxqphMX4IuYevRtEGk8TB08BvAGHic37 X-Received: by 2002:a05:690c:f8d:b0:5a7:ec51:9218 with SMTP id df13-20020a05690c0f8d00b005a7ec519218mr948091ywb.25.1697028270328; Wed, 11 Oct 2023 05:44:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697028270; cv=none; d=google.com; s=arc-20160816; b=tiVdQL2I07WdCj8gZpnaIDhOtO8JPiy5u5VMLk/4k4sEr/Hhm5jAbEuzgdGVUW6EtD ajpYbYBZ7BRSccIdAaBrRbx6rvx0S7nqvi0ZCMYw1gBe38nxzJt6Zbev4U0DmwxK57+O tf5hTBui0I1cz4f+ZhMAydjjwkvvfAeSeJMuBfgfkpNpbAfFEgFiVGpC08vky4IhrYsd Och++rzkAGv8A9dHQsTUNvUxjXRSEyoZni6sX2ypax+QccgHudKuGn9djvC29OlxRDwS wS38gB4YH46/c6qWuOT4T/U46aekEWoFdKSrHBHi8/0hEjjmUHOJp6HVDFfYKoCKYmf3 BbWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9Z09Y/GItrb7H2jZdZdkzhC3ro+JpWcdXOXIpSdTNVM=; fh=NUepcibn3Ul1fs7bXML6Z4FkqQ6xf4q4E0+GyNLWzbg=; b=OiQf5f19PgePFhjeMHtsSs8Jm1tRqkLU+6ChNN/xsh9h+J+KmxcUKgRTqjI0Mw7xIX wfBLY4FH1sVXKFsMaPftr2IEOqTbybN43iv1FeVjeO6Kfpx7WaoerGixxXnfBZut/jyp bWLqnwZS+DApdZWCO1X/eT++VW7s7svgGPYY+NwHirN8i68ZY4GAsmPzaD12jbj9uTQ3 9FuHJvu4RC2Shnntm85Ph/zRLwuv2OEOUmxNZAqRh4bgOTkUT/Z6nXYW51nzNvh7DkYa A7zndW/rzdRnhJu4FQM7psjLadPOn+zpL7aMZwFICKpp5eX1F7n8Du87NOpmDgs4HeRC CxUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CmeSpSxd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bk41-20020a05620a1a2900b0077575554544si9470812qkb.338.2023.10.11.05.44.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2023 05:44:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CmeSpSxd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqYYl-0006kk-GM; Wed, 11 Oct 2023 08:43:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqYYe-0006XH-VV for qemu-devel@nongnu.org; Wed, 11 Oct 2023 08:43:26 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqYYc-0003EB-4b for qemu-devel@nongnu.org; Wed, 11 Oct 2023 08:43:24 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40566f8a093so62662125e9.3 for ; Wed, 11 Oct 2023 05:43:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697028200; x=1697633000; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9Z09Y/GItrb7H2jZdZdkzhC3ro+JpWcdXOXIpSdTNVM=; b=CmeSpSxdi2RmpGz8icU5jf+A4ga8rvgj9E/+6nVVZIiN6Mr8Ow+NDXGxgOLST0IBye LppMzujWEtx3HFkVvUoUk2tXuOoCaApBD8vzIigVwmzvO8p8mCuQT0yHNQ01eKjgypuQ o3H8QCMmPXml8QgmgFFTq2L4pAuYBNpXX8bIww505PQJos2HaWRvik7x/2uViM07cNO7 jpaRasedWEFNAAKBZHgks9S5nUfFOwZsgt4bJTH0rCeah67NJvFsZUSwwq9ShD+Q6ERa /VRniHJ5ThYp8rAZYaLbsd2rQAq0NtJReSqmAib098zhQ/s0KM4NjgCDd6EnbbtLlmN4 U4xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697028200; x=1697633000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9Z09Y/GItrb7H2jZdZdkzhC3ro+JpWcdXOXIpSdTNVM=; b=Bdsm+FnZwRe2Qcf8mLr2+HTgagsWQQDMCSZMYEgCukX2H7dU45bKi7L6fd6q/VH5Uj XBWu+eptLPBhLr/BkkW5WrxnTD+LML8Pcy6mMxXrz+DdJ9evjpFlrXnlTAA6Qzws8gBc 2zyrCsW7Pe9ZEWrN0PktB0FG2mtBgT9hv2DwowCA0i8ejotOER+7aN6rZxoPzm+dxIjn JXS6sg9rh2Ir8BQi4uPKbnKGX1OZSGZZbbZKILUguABww5XLq3IOyasjgdNurv07R/6i fiUTIG2NdHOolCJwgr25sz/xpTBzhyMFgi1sqfcGKQvyjzhzvAteo7R663yb1rYaDmx1 da4g== X-Gm-Message-State: AOJu0YxQ+mRkF5iiYNDE10ZST2KNhnHckGBmO75eT1R8ZHfNk6gsdE/i tdeNhJFfnkuTtjBTQ5kbr6vysQyAYEitJ22lPJQ= X-Received: by 2002:a05:600c:1caa:b0:407:5b54:bb15 with SMTP id k42-20020a05600c1caa00b004075b54bb15mr2822159wms.36.1697028200565; Wed, 11 Oct 2023 05:43:20 -0700 (PDT) Received: from m1x-phil.lan (mdq11-h01-176-173-161-48.dsl.sta.abo.bbox.fr. [176.173.161.48]) by smtp.gmail.com with ESMTPSA id 10-20020a05600c228a00b004065d72ab19sm19181749wmf.0.2023.10.11.05.43.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Oct 2023 05:43:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: BALATON Zoltan , qemu-ppc@nongnu.org, qemu-trivial@nongnu.org, Markus Armbruster , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] MAINTAINERS: Cover hw/ppc/ppc440_uc.c with Sam460ex board Date: Wed, 11 Oct 2023 14:43:11 +0200 Message-ID: <20231011124312.60476-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231011124312.60476-1-philmd@linaro.org> References: <20231011124312.60476-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org hw/ppc/ppc440_uc.c implements the TYPE_PPC460EX_PCIE_HOST device, which is used by the aCube Sam460ex board. Signed-off-by: Philippe Mathieu-Daudé Acked-by: BALATON Zoltan --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9e7dec4a58..8c07d07927 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1482,6 +1482,7 @@ M: BALATON Zoltan L: qemu-ppc@nongnu.org S: Maintained F: hw/ppc/sam460ex.c +F: hw/ppc/ppc440_uc.c F: hw/ppc/ppc440_pcix.c F: hw/display/sm501* F: hw/ide/sii3112.c From patchwork Wed Oct 11 12:43:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 731963 Delivered-To: patch@linaro.org Received: by 2002:a5d:54d1:0:b0:31d:da82:a3b4 with SMTP id x17csp384360wrv; Wed, 11 Oct 2023 05:44:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4iiPIgtwo7RndldCTzFTLh3dYoM+cXqcaNCmRq4pHYVbdcYep0wPii5SVP2hG3vdVBNVl X-Received: by 2002:a05:620a:4415:b0:775:9a30:f2d8 with SMTP id v21-20020a05620a441500b007759a30f2d8mr26348739qkp.24.1697028276962; Wed, 11 Oct 2023 05:44:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697028276; cv=none; d=google.com; s=arc-20160816; b=KkQ1udskTncy4ZQW125Rv+8RoSvLXLs4GMx5FzpQTfclJf5zxwYhiYFkviP8lqfZhX ItPsgxhWsRMSDslWah2aR7vAoRhgclX5CctI/7ZICv1e07LwwF7jD7RPVBBK+LBcMcnr QVBEOuqpO3ZUQSRmCp+Aaa4697WWTzB/oWtlYtSfHUUsRF5X+Ux7n0uxdWGlHkcoUvHz otY9MhppXm+iEydNvVfQiT6twW/gcIfQjebXdCCN9/Ap/Yj6quyb/j2T3Aa9/clAgJrc Ww2U2xdjX4INDFPwTBrhFE6DKrSWvUAB5BQ6micbN0PFfip2FFXShCgsyDeyfDIQQ50f f2gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vxaAINrq3Mze6vSSQ9tfijhvvCdKsip5zQTvkm9DzJo=; fh=NUepcibn3Ul1fs7bXML6Z4FkqQ6xf4q4E0+GyNLWzbg=; b=O2VGeyYx60QipEoW4xlRU+CKHsESk7cPpvww0sEnDx6cs636SKhTtSub4YeYezWqIi AhGBG4ZKzTq8A+Eo6oTRVfgVmaruFERwrjNPpvq3LkQ0I16IAC31sulr98Hmp2yRWSCs RDkxZ3M9uBeMZi3k1I0+d7oFRUGWLxdTmY/JmgHwlzojfkDKkz2ksO6S5t2lVTQwlQnL Qsag41KWZjIBrKzvlqxRbd0nVK+wh+f103ApT3ASJNvbKlnBfvKzfpU1dyOq+AEYxCtJ 0c/LuhKxxRoAqiC/pycngTHfty/yDoOrJ2hopInUT+rJ6ITCMHQFSit4bkeHxXJIYbug ifvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qsssc+Bh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p9-20020a0ce189000000b0066cfb9d8039si2132337qvl.607.2023.10.11.05.44.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2023 05:44:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qsssc+Bh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqYYr-0006rS-0o; Wed, 11 Oct 2023 08:43:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqYYk-0006kv-TU for qemu-devel@nongnu.org; Wed, 11 Oct 2023 08:43:31 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqYYi-0003GR-0Z for qemu-devel@nongnu.org; Wed, 11 Oct 2023 08:43:30 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-405417465aaso65225775e9.1 for ; Wed, 11 Oct 2023 05:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697028206; x=1697633006; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vxaAINrq3Mze6vSSQ9tfijhvvCdKsip5zQTvkm9DzJo=; b=Qsssc+BhXy7W/dzZ3R8wjkCkR/jTqGoWD3aR5+nOr4xUiglKPFQp+q7KGOc83+iBCA m6LmLfdasyAwi9mWTuaJ7xSamGeFBvdr1JbVZr8qnZ57TRFEnbVz2UHZ1SS0ib724nx8 cjbqYsUu87VZ/mw/y0aFQ8B+pGQkspBeDZEwXJai9BFjkh0sdfprMxofvxpINk8pHUq+ sDEsxKM/SnaXW9+ca6uWYLhG21rdVwDzAJloo7ihSlJG1RgN317SUWkRxJTFmunJ6cDW 6+yOCVy5WM330I9rZpLw7akKtDyTiR8wqWPlPelflFTITFBqY8ec/Sz+QX8X4Gige1iY +rOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697028206; x=1697633006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vxaAINrq3Mze6vSSQ9tfijhvvCdKsip5zQTvkm9DzJo=; b=axeuMQs2wXjxWSB0aE2EZpPC/BtH/sviIhe/xEVYW5/wSSQVRw6GfCcaBiDxPxI7cV 1Zq6w3V+DlKuMCPUv56xPYfyUppzNo9VbKL9862wikJ4ixyeBwQERV7+FkwJeoBqgYI0 t7aNI0kbIXLm+7obwEfYkr5cBlfhqrKVCf258l89L0DcMqi/0682qRBT4yGJCQw2r2JH MOz4zTg/5vK0MsDfq6oxLAqKwM6je3puCU/E3sIs0xWavJkQvWztrjVarAQwb++BVtSo 5dGaEeFkODpeJxM7H9gy2IGDFf7QyzknoUQ/Y/beB6/EfHZMrt478U77KvUSKvLVnOlQ y65w== X-Gm-Message-State: AOJu0YwgYKcFuLZOaVwiNbRLlyGNr/uPvw4yZgpPwNID/7nL9BeRuf98 nm9mQCCHXK/tl1LL4TWYEpNHRDsKcgcRthQnSpA= X-Received: by 2002:a05:600c:3b14:b0:407:4944:76e5 with SMTP id m20-20020a05600c3b1400b00407494476e5mr7745351wms.22.1697028206049; Wed, 11 Oct 2023 05:43:26 -0700 (PDT) Received: from m1x-phil.lan (mdq11-h01-176-173-161-48.dsl.sta.abo.bbox.fr. [176.173.161.48]) by smtp.gmail.com with ESMTPSA id t25-20020a1c7719000000b004065daba6casm19158429wmi.46.2023.10.11.05.43.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Oct 2023 05:43:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: BALATON Zoltan , qemu-ppc@nongnu.org, qemu-trivial@nongnu.org, Markus Armbruster , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] hw/ppc/ppc440_uc: Remove dead l2sram_update_mappings() Date: Wed, 11 Oct 2023 14:43:12 +0200 Message-ID: <20231011124312.60476-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231011124312.60476-1-philmd@linaro.org> References: <20231011124312.60476-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Apparently l2sram_update_mappings() bit-rotted over time, when defining MAP_L2SRAM we get: hw/ppc/ppc440_uc.c:83:17: error: no member named 'isarc' in 'struct ppc4xx_l2sram_t' if (l2sram->isarc != isarc || ~~~~~~ ^ hw/ppc/ppc440_uc.c:84:18: error: no member named 'isacntl' in 'struct ppc4xx_l2sram_t' (l2sram->isacntl & 0x80000000) != (isacntl & 0x80000000)) { ~~~~~~ ^ hw/ppc/ppc440_uc.c:85:21: error: no member named 'isacntl' in 'struct ppc4xx_l2sram_t' if (l2sram->isacntl & 0x80000000) { ~~~~~~ ^ hw/ppc/ppc440_uc.c:88:50: error: no member named 'isarc_ram' in 'struct ppc4xx_l2sram_t' &l2sram->isarc_ram); ~~~~~~ ^ hw/ppc/ppc440_uc.c:93:50: error: no member named 'isarc_ram' in 'struct ppc4xx_l2sram_t' &l2sram->isarc_ram); ~~~~~~ ^ hw/ppc/ppc440_uc.c:96:17: error: no member named 'dsarc' in 'struct ppc4xx_l2sram_t' if (l2sram->dsarc != dsarc || ~~~~~~ ^ hw/ppc/ppc440_uc.c:97:18: error: no member named 'dsacntl' in 'struct ppc4xx_l2sram_t' (l2sram->dsacntl & 0x80000000) != (dsacntl & 0x80000000)) { ~~~~~~ ^ hw/ppc/ppc440_uc.c:98:21: error: no member named 'dsacntl' in 'struct ppc4xx_l2sram_t' if (l2sram->dsacntl & 0x80000000) { ~~~~~~ ^ hw/ppc/ppc440_uc.c:100:52: error: no member named 'dsarc' in 'struct ppc4xx_l2sram_t' if (!(isacntl & 0x80000000) || l2sram->dsarc != isarc) { ~~~~~~ ^ hw/ppc/ppc440_uc.c:103:54: error: no member named 'dsarc_ram' in 'struct ppc4xx_l2sram_t' &l2sram->dsarc_ram); ~~~~~~ ^ hw/ppc/ppc440_uc.c:111:54: error: no member named 'dsarc_ram' in 'struct ppc4xx_l2sram_t' &l2sram->dsarc_ram); ~~~~~~ ^ Remove that dead code. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: BALATON Zoltan --- hw/ppc/ppc440_uc.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index 4181c843a8..643a79e330 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -73,46 +73,6 @@ typedef struct ppc4xx_l2sram_t { uint32_t isram0[11]; } ppc4xx_l2sram_t; -#ifdef MAP_L2SRAM -static void l2sram_update_mappings(ppc4xx_l2sram_t *l2sram, - uint32_t isarc, uint32_t isacntl, - uint32_t dsarc, uint32_t dsacntl) -{ - if (l2sram->isarc != isarc || - (l2sram->isacntl & 0x80000000) != (isacntl & 0x80000000)) { - if (l2sram->isacntl & 0x80000000) { - /* Unmap previously assigned memory region */ - memory_region_del_subregion(get_system_memory(), - &l2sram->isarc_ram); - } - if (isacntl & 0x80000000) { - /* Map new instruction memory region */ - memory_region_add_subregion(get_system_memory(), isarc, - &l2sram->isarc_ram); - } - } - if (l2sram->dsarc != dsarc || - (l2sram->dsacntl & 0x80000000) != (dsacntl & 0x80000000)) { - if (l2sram->dsacntl & 0x80000000) { - /* Beware not to unmap the region we just mapped */ - if (!(isacntl & 0x80000000) || l2sram->dsarc != isarc) { - /* Unmap previously assigned memory region */ - memory_region_del_subregion(get_system_memory(), - &l2sram->dsarc_ram); - } - } - if (dsacntl & 0x80000000) { - /* Beware not to remap the region we just mapped */ - if (!(isacntl & 0x80000000) || dsarc != isarc) { - /* Map new data memory region */ - memory_region_add_subregion(get_system_memory(), dsarc, - &l2sram->dsarc_ram); - } - } - } -} -#endif - static uint32_t dcr_read_l2sram(void *opaque, int dcrn) { ppc4xx_l2sram_t *l2sram = opaque;