From patchwork Wed Mar 2 20:52:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 547516 Delivered-To: patch@linaro.org Received: by 2002:ac0:f585:0:0:0:0:0 with SMTP id s5csp27023imq; Wed, 2 Mar 2022 12:54:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrZwFMqedlyL3o834I22vZU2RdZUoG5vC3Oaet00L+nzUXrAbgkiCU0YK2rFhr7/GLkp2V X-Received: by 2002:a05:6122:1692:b0:336:50d0:c772 with SMTP id 18-20020a056122169200b0033650d0c772mr4778809vkl.3.1646254471025; Wed, 02 Mar 2022 12:54:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646254471; cv=none; d=google.com; s=arc-20160816; b=YK5gsNQuioRkKZzGz+nWpXN55Y5iDZdSbhpqUoH8NaN7W6jk/Na5zxXrzcVnOYRDAt 6WsJC8k5WmvONw7/sPAMTpm81y8z7lQJ8w+uf1aVlZRT2x7OfBlwwNNboMNm4gdq8yHi whKg24/r6G1cz0sS7fGISiSupbK2R745GYjCWxwVwPhTkdP7ThhVWKJAwrYGe+jOFtFc Kq/qmEfFRvbad+zBj47fOnLhvwU/vADQmLFCNEMe2kw3pu3lYCZ6N4SvvzItxC14B0q5 1gzncR8ScmmqlnFmv6oDNtiO2L4T7NIXFb/Hymjg09LodXxBj+sz1tW5SDOF00WIwSyk 5uNg== 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=bI6UFhAMhWBlOHTyDE4RG/auEtkAok0MRzYGhv/u1kY=; b=iwJNl/9TVsYFnFBLjw7E8UXpH6KiDVN9ZBwJmzO6H9gtX9MnphXXVLDbceKsPrHGeI lYF6p/qimUrzkTCmh22cGIV2aSZwpmRK3gRvrEnDqZrigZ7eusaEQA1jYirB/p3PNj3w gw7ZO4YHEEDZtdp/c2YCPQCEmCFohQ82ELunwY9bxEAPJp5JABi0B+YBG6Ceap6Fdrkx TYSK5Sg4Ucm0DO56rrD+EtZklEj7HtcPzBqB7MhGJJ2+JptDyylSwgUjjNgUQfmwU0E6 8gf7JfFgZl9FnRNACj4u8A6a8W82QxfaBW57BUMKXliY49CkqDcEtkM6PqlcBj1PtO3G bV/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HSWuVSLq; 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 f18-20020ab060b2000000b003460e2250c5si10007uam.180.2022.03.02.12.54.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Mar 2022 12:54:31 -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=HSWuVSLq; 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]:34732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPVzS-0005hb-IF for patch@linaro.org; Wed, 02 Mar 2022 15:54:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPVxd-0005cC-2G for qemu-devel@nongnu.org; Wed, 02 Mar 2022 15:52:37 -0500 Received: from [2a00:1450:4864:20::330] (port=43934 helo=mail-wm1-x330.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPVxb-00084v-3N for qemu-devel@nongnu.org; Wed, 02 Mar 2022 15:52:36 -0500 Received: by mail-wm1-x330.google.com with SMTP id a5-20020a05600c224500b003832be89f25so2047090wmm.2 for ; Wed, 02 Mar 2022 12:52:34 -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=bI6UFhAMhWBlOHTyDE4RG/auEtkAok0MRzYGhv/u1kY=; b=HSWuVSLqonGBTA5KkMSfYC9rki+0bEp1BlYe0TOupq4TJ/V5YUyu139MZy/TAJLnsd +SCEWJeToMPXwg9qdcdBMOJBbO8DLDfFZ+W+IA4ukJUjJAckNFJWlBxB+VyZWfl2ajng SEwcvr9KHEHhemksN+S6lGe3dxGFtezhxjJCubTPK0vA1ggWAVYvkzcfYFiivS5tkRnv 9vfALIoYe2isF5HbvwA2DEBDGlUiY+Iz59PaXYTjHx8X9gvaSpIZHPUaWjXYNMkovbO9 llcVtyQZozP9re1/xilvTGQozzfw3jIXtuhcSbvw5kN8FYai1qXAOdKfi9ZHdjq7+6q4 dwmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bI6UFhAMhWBlOHTyDE4RG/auEtkAok0MRzYGhv/u1kY=; b=EwdjHCpqc1F5UO9E+odMIaUeXBP+USVCAQUv2mR8pG6+HPLjQFq9o/QFkkxbpY4DXx I6OVcnFZzm1McjiDspShCz+A/TvhAMkHMtfyMIz4qBnwAyX1lhW5LqUt3ZW6PhaRT/2z yYpe//16ZijI2IkD/lFEiy39aWfyiSxV/QCwZUIbN+RyHRFBjF36yS9QZUCtesZtMRjj 51vfmbBJqdTnGLhw+GNbn5JRp0p1TtLBtpzTERRd1oe8rlbhu3PrfDlurkXbPvtLDujE CYH2XmE60vfzBuUI2V1oAZ3FlgtenP2no3ULcevzJzzByr+bhjk/MXM6Fmb1Wv5TfeOL r17w== X-Gm-Message-State: AOAM530iZrXU2ObpK1NdXTBb5o/VMQwqAWe9NhjGeTkUjHUP8cKxScD/ rf2LRVprt5/T8i9EltfF9abpTQ+6Y65xSA== X-Received: by 2002:a05:600c:47d1:b0:381:1c01:2aa7 with SMTP id l17-20020a05600c47d100b003811c012aa7mr1297381wmo.189.1646254353736; Wed, 02 Mar 2022 12:52:33 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id x13-20020adfec0d000000b001e31279cc38sm90801wrn.11.2022.03.02.12.52.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 12:52:33 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/26] mps3-an547: Add missing user ahb interfaces Date: Wed, 2 Mar 2022 20:52:05 +0000 Message-Id: <20220302205230.2122390-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220302205230.2122390-1-peter.maydell@linaro.org> References: <20220302205230.2122390-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::330 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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" From: Jimmy Brisson With these interfaces missing, TFM would delegate peripherals 0, 1, 2, 3 and 8, and qemu would ignore the delegation of interface 8, as it thought interface 4 was eth & USB. This patch corrects this behavior and allows TFM to delegate the eth & USB peripheral to NS mode. (The old QEMU behaviour was based on revision B of the AN547 appnote; revision C corrects this error in the documentation, and this commit brings QEMU in to line with how the FPGA image really behaves.) Signed-off-by: Jimmy Brisson Message-id: 20220210210227.3203883-1-jimmy.brisson@linaro.org Reviewed-by: Peter Maydell [PMM: added commit message note clarifying that the old behaviour was a docs issue, not because there were two different versions of the FPGA image] Signed-off-by: Peter Maydell --- hw/arm/mps2-tz.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index f40e854dec7..e287ad4d06b 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -1078,6 +1078,10 @@ static void mps2tz_common_init(MachineState *machine) { "gpio1", make_unimp_dev, &mms->gpio[1], 0x41101000, 0x1000 }, { "gpio2", make_unimp_dev, &mms->gpio[2], 0x41102000, 0x1000 }, { "gpio3", make_unimp_dev, &mms->gpio[3], 0x41103000, 0x1000 }, + { /* port 4 USER AHB interface 0 */ }, + { /* port 5 USER AHB interface 1 */ }, + { /* port 6 USER AHB interface 2 */ }, + { /* port 7 USER AHB interface 3 */ }, { "eth-usb", make_eth_usb, NULL, 0x41400000, 0x200000, { 49 } }, }, },