Message ID | 20220208113948.3217356-11-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 49865b901466d8f8ad4f16df4bcd076eee268e0f |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp450200imo; Tue, 8 Feb 2022 04:31:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRWfrzh0faaADBduzeCdoD+c2ySUTked7iR1sAdPUrzGD2TMJS3D/t98O8gM3Bt9W5tGZY X-Received: by 2002:a25:4805:: with SMTP id v5mr4073545yba.258.1644323503480; Tue, 08 Feb 2022 04:31:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644323503; cv=none; d=google.com; s=arc-20160816; b=sc+uVWVk3hc/hdbJlVuZvwgaKZfURwft/kXR873axXFPavnv71FqLh4mdnqIMvWdhW JF3+dIMra1FWQVs2THx1Sy89/AlmBaPqn506sqrYKUJA3t5eADBIAzJ2y+Th2edUzXoO ROhXs8JkDL8VyI5D18VE43NEedWh6vGDfGPbboQXYnFBlV9vuR/h4wtnFipo21K7ppcI Si/yBhPaLvgz2c25/q4r1gzmaLhJNPHtLGuoU5IejupNM8gPS2TDXz6PPi0F0lV1p4nn U03VU19XRPr6KhAtFKn5I1+n2TvlA9ungaskbqsEesZ7IJt2ePz9FqDeMxzHhsWGSiSA 39RA== 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=PVQGUaLUYR0ZoTmSZ6QO0Yr2xljBTBn4GGoM7Uq+BeA=; b=abw2MbH2sEPESQl/BJIaFSbezO9NkjTVrDS9wy+mh1LB26DKNf2Hzcv2VScWKaYpIC vJGv10aDXTMEMyKhrvY5TbJifLaYbA4JTYLbCtaQmOyffuYFRTM83IoWgNpl3t+yBxQf /jgCr5btFbM7C+Ask680ws3+hyNAwXItDcrKS8qlIetYlihPO/vMZ87xGQM9vjHjlptf 5PGGBMY5T+FNSoDfssIhSh7RLZ1lHI3bcdmhYGbml5pSqCly5hLvxLCz49abhaM86ig4 nRFhDbbnSkcTpruu8UQfazMoMrDcgyCmvPn04q+zBuUOYEMHs/OVsnRyQzaT09OJsygt DmnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K8oBm1Q9; 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p14si6184492ybg.776.2022.02.08.04.31.43 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Feb 2022 04:31:43 -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=K8oBm1Q9; 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]:59128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1nHPen-0007ou-9P for patch@linaro.org; Tue, 08 Feb 2022 07:31:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1nHOqn-0000ii-Hu for qemu-devel@nongnu.org; Tue, 08 Feb 2022 06:40:02 -0500 Received: from [2a00:1450:4864:20::429] (port=39795 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1nHOqk-00024B-OI for qemu-devel@nongnu.org; Tue, 08 Feb 2022 06:40:01 -0500 Received: by mail-wr1-x429.google.com with SMTP id d27so1898604wrc.6 for <qemu-devel@nongnu.org>; Tue, 08 Feb 2022 03:39:57 -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=PVQGUaLUYR0ZoTmSZ6QO0Yr2xljBTBn4GGoM7Uq+BeA=; b=K8oBm1Q930r/T5dq+sVt7665hLlm4M/LVl6Ol5GcdYYg+MEP5uve4olVvQEat/F0td X1Kuw1YASyXuVdEy/B425/uc8iCEwQWTVSVZFhKRx2XlVVeah1BXACp5Rpbp1ErL6lUL 947JZ4gAhHGf3fOjrsflXewMGNDjI2yWGle+RGypGZq19D7ZDkek+AkSTNH1SGgofwzs wLtLsIATP6eDDZk+zwT+c2ntjnmwiK77G81FyyHbFradPlZA28WGgQ9Hnzj358QvgoDj xK4zZYi6yoKyCZDDUT1XS00nkXv0XEjc+gssQauxIl+1WKrk/7iSJE7kY7B2QiMEMhCs qcsQ== 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=PVQGUaLUYR0ZoTmSZ6QO0Yr2xljBTBn4GGoM7Uq+BeA=; b=ZugRvxTmfxo2hoWN7oWQ8CqwUGMcSdw4W53i7PpfLYVThJRFZIhB5tw5iFl/2Kh+bF A9uol2vHrxdmfa0vc704pAvuPgqNQ5jvHjKqwUzm0eT7Ny4Eix1LieWVv6cOk4zN7hdQ 5ymWiz7jA3vEu1EGRRehp/MU60Q3eRG4lSjsF++iXIW4NLdlsJJ0uu37i+R6yksPEAA1 FvvaszZ5pYIPn83HmrWWMR3tljHradxKP/S5OPP7/LH3gSoZyHCt4EB8W4AGLTjm/xuD crzK+7XWqrFgWsKlo770Xi7Q5TRm5GYxAGCUiDHJKllXzZhoBkSwk7o/sGFf2Yl7/XAf f+WA== X-Gm-Message-State: AOAM530/Gdu5mEnmdptWMzMEPkqm+nWt0KJ+dMGklzL7lHjYTXXkKRjY rMSL16cYs2r6hkMdP7s8jpvfaI0QeqTc/g== X-Received: by 2002:a5d:49c1:: with SMTP id t1mr3232732wrs.359.1644320396642; Tue, 08 Feb 2022 03:39:56 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id r11sm4245199wrt.28.2022.02.08.03.39.56 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 03:39:56 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 10/39] hw/arm: allwinner: Don't enable PSCI conduit when booting guest in EL3 Date: Tue, 8 Feb 2022 11:39:19 +0000 Message-Id: <20220208113948.3217356-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220208113948.3217356-1-peter.maydell@linaro.org> References: <20220208113948.3217356-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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.001, 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://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> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
[PULL,01/39] target/arm: Fix sve_zcr_len_for_el for VHE mode running
|
expand
|
diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index f9b7ed18711..318ed4348c7 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -235,11 +235,10 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp) /* CPUs */ for (i = 0; i < AW_H3_NUM_CPUS; i++) { - /* Provide Power State Coordination Interface */ - qdev_prop_set_int32(DEVICE(&s->cpus[i]), "psci-conduit", - QEMU_PSCI_CONDUIT_SMC); - - /* Disable secondary CPUs */ + /* + * Disable secondary CPUs. Guest EL3 firmware will start + * them via CPU reset control registers. + */ qdev_prop_set_bit(DEVICE(&s->cpus[i]), "start-powered-off", i > 0); diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index e7963822367..68fe9182414 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -105,6 +105,7 @@ static void orangepi_init(MachineState *machine) } orangepi_binfo.loader_start = h3->memmap[AW_H3_DEV_SDRAM]; orangepi_binfo.ram_size = machine->ram_size; + orangepi_binfo.psci_conduit = QEMU_PSCI_CONDUIT_SMC; arm_load_kernel(ARM_CPU(first_cpu), machine, &orangepi_binfo); }