From patchwork Fri Mar 5 17:15:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 393578 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp661661jai; Fri, 5 Mar 2021 10:27:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwHn5X47GZE/AJJPTp3gVhCExPPZcno1a3LJoywZbY5NJEbqbQNEDAy7w+1GM/SLef44gg X-Received: by 2002:a92:8752:: with SMTP id d18mr9371001ilm.283.1614968861853; Fri, 05 Mar 2021 10:27:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614968861; cv=none; d=google.com; s=arc-20160816; b=0HXzXSfkF5kR+MTD2Y+k0JExPzSuDDBJl4vwN0WC7nFk9K6nb3jt/FYuj3JGPxAXOF iDnliXlIm/42Q6EHo1v2Qrt5R3dt4ZbEUVc1Gscv4f5Ziy+14Koy7rcGbKR6AXF/JL5t CNlTPYhU+3INRBFsGi6cKNZIxjQ5GrQmZ78DsmoHqH5fV8thQe4R2n4NsCdNEqNyj+eD F+JANmjtp/LSiP32RyXSs9sA56Zw9kc6iiyFTwx/1zh5WPs8iThHIp6uwRtqI0Ksiqt4 lbrb9nbOjZqfsGkFmWOZ9a+4o4PCJ7juynm1xFkakmb2oOJno4XL5SFbnlzeJgridsok kjGw== 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:to:from :dkim-signature; bh=+ePC5MrRsVUEVhaE0qNz69qfHz3Jx96PkbzZ+pkdYA8=; b=oMurE2iky2N7XTftl5KUCu/zl59EuMz6JiHntm/ls21xP3+xtfie9YAYTMDT2FKpgb jTHKj9d4TZl9JDNUXmW8Ytkb30i3N+7ZuHrrnvilLhyZFiHN2V74vjmwNa1Sva56wIZH aBLknMA1bDFTBGozyIJ1wdyqiZ1ItCqeWi6dNptODuT7w63AywRDUWosUbP9zTcCfG1f aRuTtNUSwIVIVI+XBhlr2P9nBeDYAk0FhNkQN6ieE+B36axrst5E2k/Lzg+hpTroY+aD b4hEKkb08GnijCZ/gxTMDUa8GXuW5xtZkQ5iF3mf2Sxs/ddO9Iho9lwH9v4dDXNLrpgu RmZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="zovA1/vN"; 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 x10si2861871ilv.2.2021.03.05.10.27.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 10:27:41 -0800 (PST) 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="zovA1/vN"; 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]:57134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIFAr-00074a-9Z for patch@linaro.org; Fri, 05 Mar 2021 13:27:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIE3q-0007PP-Ui for qemu-devel@nongnu.org; Fri, 05 Mar 2021 12:16:32 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:37321) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIE3H-0007hy-79 for qemu-devel@nongnu.org; Fri, 05 Mar 2021 12:16:21 -0500 Received: by mail-wm1-x32b.google.com with SMTP id m1so2110990wml.2 for ; Fri, 05 Mar 2021 09:15:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+ePC5MrRsVUEVhaE0qNz69qfHz3Jx96PkbzZ+pkdYA8=; b=zovA1/vN/PSyzFDhK2x8LY/G44r5Og4vHdvdVbINlCnRilFZ1QSFtKh8og9qEHb7tA EefnufftoL1M5qNxsCs/WTdGsc1ZUs5jfZlt890X51TkSIe2nEUTvISL7k6xaaRYx6j7 oM8VYazl66iLn/1eD9XQgpaHT1aGlHr/PWEizdX1ZBjxT8DWoQHWwQk3uUhfGTh8jb+J ZzozdsYj4QN6nobS+6QN+5atir549vTb4NRLero2NbDoedNl4uFVvkJ10xvifKWtNhU1 7YJ4Oe4EdvejnimMwkRfeu0V/C85QD6gHBkg08vBfr9Q1v1Y4/fvFXXcvmdCrVePSmHe 06GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+ePC5MrRsVUEVhaE0qNz69qfHz3Jx96PkbzZ+pkdYA8=; b=IsrLNS7y1ZIIHZ9IgpEgi6pbffH5bTZW+TAg1qvCIVilz3fYXFBKc1G9xvmcwOB4+k jwOAxWNl8pzr4kk/gOKwzo7wAxC1olTNZCtudvpgT8ie5vvaLVZ8gDpen3aWKNvMdo2w emlMQ2q69XJBQ5Hf5d9TnhysGkaoncCNifyQ4ATJQrkqFaY9U8HL8ub9walKpNkmZ5oE 8CLdZyARwUPTCEIKMKKmQYDxSrN/WaXzdgL4kqIL6w1PyDfgDtFiNUW87SgDPOTbi90z tUixB71Gh4gd1qd9e76kSx3j5fVAcVzmzRmsEJ2dPRx3PQrTyj39yjH8IitP0P97sgqX 7rVg== X-Gm-Message-State: AOAM532KdaiQCslCsLjM1DDN42hBwpE2ekCkBfNrDU6DmOpjue2bABH5 1dH535YE58ubLafwXe/DrosMc5Fe6WI0vQ== X-Received: by 2002:a1c:f702:: with SMTP id v2mr9646614wmh.131.1614964545240; Fri, 05 Mar 2021 09:15:45 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m132sm5942357wmf.45.2021.03.05.09.15.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 09:15:44 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 40/49] hw/arm/mps2-tz: Allow boards to have different PPCInfo data Date: Fri, 5 Mar 2021 17:15:06 +0000 Message-Id: <20210305171515.1038-41-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305171515.1038-1-peter.maydell@linaro.org> References: <20210305171515.1038-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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.23 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" The AN505 and AN521 have the same device layout, but the AN524 is somewhat different. Allow for more than one PPCInfo array, which can be selected based on the board type. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20210215115138.20465-16-peter.maydell@linaro.org --- hw/arm/mps2-tz.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 1c1fc34dd53..d20b2068868 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -423,6 +423,8 @@ static void mps2tz_common_init(MachineState *machine) MemoryRegion *system_memory = get_system_memory(); DeviceState *iotkitdev; DeviceState *dev_splitter; + const PPCInfo *ppcs; + int num_ppcs; int i; if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) { @@ -544,7 +546,7 @@ static void mps2tz_common_init(MachineState *machine) * + wire up the PPC's control lines to the IoTKit object */ - const PPCInfo ppcs[] = { { + const PPCInfo an505_ppcs[] = { { .name = "apb_ppcexp0", .ports = { { "ssram-0", make_mpc, &mms->ssram_mpc[0], 0x58007000, 0x1000 }, @@ -598,7 +600,17 @@ static void mps2tz_common_init(MachineState *machine) }, }; - for (i = 0; i < ARRAY_SIZE(ppcs); i++) { + switch (mmc->fpga_type) { + case FPGA_AN505: + case FPGA_AN521: + ppcs = an505_ppcs; + num_ppcs = ARRAY_SIZE(an505_ppcs); + break; + default: + g_assert_not_reached(); + } + + for (i = 0; i < num_ppcs; i++) { const PPCInfo *ppcinfo = &ppcs[i]; TZPPC *ppc = &mms->ppc[i]; DeviceState *ppcdev;