Message ID | 20250113195525.57150-18-philmd@linaro.org |
---|---|
State | New |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a5d:525c:0:b0:385:e875:8a9e with SMTP id k28csp1601208wrc; Mon, 13 Jan 2025 11:57:18 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVBv2qYsIkvn/+wKaU9DVbF7FBf3V9wNPj31A3wgl4j6RPoAHBjwAG2FEVwSyxbGXPL9UT2Bg==@linaro.org X-Google-Smtp-Source: AGHT+IF0YAVOhsHowLJh/zmEft5J1+dWCIUFUcUKrBK+FrAPoJHyA3GKEavw5/7NnfI6r5+tBOj1 X-Received: by 2002:a05:620a:318b:b0:7b6:6a3b:539b with SMTP id af79cd13be357-7bcd973ef38mr3084538585a.17.1736798238192; Mon, 13 Jan 2025 11:57:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736798238; cv=none; d=google.com; s=arc-20240605; b=lKb76mZx8fRdsCXgGd6aC7EPrxI5WA6nd/uTscJgCEzs34yfAZl2PDcuiIeBq7MCzl imuUOXa72s2I77Xk2YhaJneKyN9QMNlMZ6T31Qa8mlTDSrwd3VSE8ReLz91K8AmUXnlU QMi1gLZFMge/FySfsnGddmLTUc643oSvOJKaqnR8SjOtHJBGiXgdkfj5mVu8QsUNmxSv PGvd9XVZ1VczmM4VRm7TxUxu9nA150pCeJGMUSJa6+qTxaNRHmNvrL0rqwARA2Wbedsp MzFRYiOP+QrnzUvcMQmO/P2/Uwx6uOkSuxgBBF+Sv5OgqYjO007opnqyZHNDPNNFbniN RUqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=T91VVeNWf9GIIc/CEXCMK78y9ZI5LIeof3gskqolzuI=; fh=wMwPlu6s3WDa+luMUca6ONpSmNJKUwF5E3uCFeq1PI4=; b=AU5VZhW19pr4YDdZs0v6g54Y80gFRuitL1jocd77munxHnh0S+9c+4ZCb5qOMwYwNW fbVjcMudZj+Xy6B8tiHao1lhU8e+weLN8oPjLEbzEHZiJHQOiXG9wtzxqyMYCb2xN6hX bJxDt2Wf+XqI0RXz+y/VJBJCOB2ug58KagUWmevAyrGbHBmJkGPAtNrPZRBT65INv/KQ N1lUMb4jMGclG78QPWC79t7dgJ9d24qDcNBhF9KZfipF9FghRE9r0YTFNRUmMwcPe50n wylTEOZnHfQc94w0gjlWKKk/fXyph4iwAVHqPDR8oL+zlmmZbN9U357sVMoil3x//zOr hrdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=axpLU6q3; 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; dara=neutral header.i=@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 af79cd13be357-7bce34fceffsi1256364485a.417.2025.01.13.11.57.18 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jan 2025 11:57:18 -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=axpLU6q3; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces@nongnu.org>) id 1tXQYY-0007Gj-TQ; Mon, 13 Jan 2025 14:57:03 -0500 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 <philmd@linaro.org>) id 1tXQYS-0006k9-F0 for qemu-devel@nongnu.org; Mon, 13 Jan 2025 14:56:57 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tXQYQ-0007X7-Vr for qemu-devel@nongnu.org; Mon, 13 Jan 2025 14:56:56 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-436a03197b2so33280145e9.2 for <qemu-devel@nongnu.org>; Mon, 13 Jan 2025 11:56:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736798213; x=1737403013; 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=T91VVeNWf9GIIc/CEXCMK78y9ZI5LIeof3gskqolzuI=; b=axpLU6q3x+PfMme4zMyF0Q2llIV9frZ4TrJSzQ4eNDXhv4XxGa+xlu0qf0U19TFtjN G+rZQ1lxmtyfCyeCnjlAb2fvilCY092FiGRJHUe7Gg4dx5XuGXmKmMnrJSs2BcrRTXHb QSQ7F1PFkU2sn/FGUturF9HQLOt6EiKNGvPznotATsglbRyPngIdzfSvu5nbyBKIj4xR ok44DOcepJnUN/p+ERwgpFV+ZkOcXHc+g30c62edAGCXt5bh2iZzVyjAbdSDUoHzTve/ wHdGPejye17QR/fUDo1r3w81gue+HV92oj8ZOFrRCx4iKBOrvwHKEfjpl/pQscBjS7wh sQ+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736798213; x=1737403013; 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=T91VVeNWf9GIIc/CEXCMK78y9ZI5LIeof3gskqolzuI=; b=kk/py9p8VUZf6JPQmfOrV7a2SZqMfPEKj9n7jS/XAvboM2ebId+/JpTeNKqmOvljUO Hw3S2eSfSm/HCVV4d8dzwQrroiH24UsI/oBgLtDQOuq1RdbO8ZB0OKPZKifr+XGbv2V3 CB4+uZLKngUSEyabB8zRNEzZXgjlM8LK+5JUttyc58+zzoEGfHFE0x7uibH5jvK7KguQ iCZ7AkBDQL3yqTZRvEXZ+fmgfSpQsksGjktC3JtpC1hjH142qfjiC+WbTLiviKf5/izh s9APirT0zvhtUV+theLEB9iP+7Avg9TLGor58o22cEmMRxuidmsY15tdMu0CXih4Kmu/ Tw3g== X-Gm-Message-State: AOJu0YxeMY6B+/sHbPiurUu8FAvUXDSsxofHXvav4cBu7WPqXfhotMQk dYakfJ5VL5+ixen6vLXWtALxI5BMlvhNbAU987jGkDQPfIWO22z0FCCr/qwYSoZGXN679KUHD2R UHcE= X-Gm-Gg: ASbGncsbw6KrNpdq4Z7MlMtBT6oA4UztxJLPmJj9FDpVGCY3J3SOtYAvMFPvIcNNTCB TIpPRoR/RbUQM/9Re6T2jT1bX8Vc9jqAn6lwdNiB2NIJd+RrcqSvOPvGSTX1BYiojeGIigkne2N UEeRfMzSBbvbd1mBrhn2MksfW/rq5w5hJubJ20SRxkSxox8zfXeb1MmW8g8WyAfd3utAcSMHxI4 WvwpSbiex2ETODd3SJHS58TzOr3HiQqnwB4NoY3Wq2Xd1ks5unc1vSpO6q69XlEHmxoF9KqTs8U cM7Cg11MVtCu5yKbvV5QHgBctgO9Ed4= X-Received: by 2002:a05:600c:1ca7:b0:434:ff9d:a370 with SMTP id 5b1f17b1804b1-436e255e2cbmr215662885e9.0.1736798212922; Mon, 13 Jan 2025 11:56:52 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2e92dc4sm185927245e9.39.2025.01.13.11.56.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Jan 2025 11:56:51 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org> To: qemu-devel@nongnu.org Cc: Paul Burton <paulburton@kernel.org>, Aurelien Jarno <aurelien@aurel32.net>, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= <philmd@linaro.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Aleksandar Rikalo <arikalo@gmail.com>, Huacai Chen <chenhuacai@kernel.org> Subject: [PATCH v2 17/19] hw/mips/bootloader: Propagate CPU env to bl_gen_nop() Date: Mon, 13 Jan 2025 20:55:23 +0100 Message-ID: <20250113195525.57150-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250113195525.57150-1-philmd@linaro.org> References: <20250113195525.57150-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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=ham 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-bounces+patch=linaro.org@nongnu.org |
Series |
hw/mips: Remove all uses of &first_cpu
|
expand
|
diff --git a/hw/mips/bootloader.c b/hw/mips/bootloader.c index e57d5c3278f..a54af8160ef 100644 --- a/hw/mips/bootloader.c +++ b/hw/mips/bootloader.c @@ -67,7 +67,7 @@ static void st_nm32_p(void **ptr, uint32_t insn) } /* Base types */ -static void bl_gen_nop(void **ptr) +static void bl_gen_nop(const CPUMIPSState *env, void **ptr) { if (bootcpu_supports_isa(ISA_NANOMIPS32)) { st_nm32_p(ptr, 0x8000c000); @@ -255,7 +255,7 @@ void bl_gen_jump_to(const MIPSCPU *cpu, void **p, target_ulong jump_addr) bl_gen_load_ulong(env, p, BL_REG_T9, jump_addr); bl_gen_jalr(env, p, BL_REG_T9); - bl_gen_nop(p); /* delay slot */ + bl_gen_nop(env, p); /* delay slot */ } void bl_gen_jump_kernel(const MIPSCPU *cpu, void **p,
Propagate the target specific CPU env to the locally declared bl_gen_nop() function. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/mips/bootloader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)