Message ID | 20250113195525.57150-6-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 k28csp1601460wrc; Mon, 13 Jan 2025 11:58:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWN8f29bvxJ1QSqYXPlPb7BEhf5yumhma3w98ECcQxvEgYudjHovF7YBy4RGfh+uPxPPzz2MQ==@linaro.org X-Google-Smtp-Source: AGHT+IHhNltrB+/vw87OWCHYmm+WsFTleECZQa48DL8q1bptCJ/SwI/ADF4cNxzPgrccZvETBluY X-Received: by 2002:a05:622a:4011:b0:461:7558:892f with SMTP id d75a77b69052e-46c7b01fb9fmr298079851cf.15.1736798289850; Mon, 13 Jan 2025 11:58:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736798289; cv=none; d=google.com; s=arc-20240605; b=UPgamor4559Zh7fiiQVpOc/GPqn5iZodHjG/Fy+XZmWs+T4CtZe2pVxdTGKbjtOuEy xoS0g04nPAyy4P19CvWYohlhDgd+nxsi+JzYs+dEAp6t5YnTutbA6giyyFktzFou30IZ TDVzK2mhOm0fKoMMrD8uJTWh0PtjaIc9e3jQTt7pvc0q8gZ9FZy84B38Thh9vUNqQ5LR 27OOJn2TOaHs2nVRPL2cLiq/AiimMX6mLIKIjzNccZkRfppkv2Cl+H6CbO4gMmsz7hrE 4hTpEXruV51NTuQMP+WFgoBxR+ffHLlBJH119Nb0rjAb3Bhssy6CYPBgvJocIXHaFgW+ 4O1A== 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=Jys96smoYe/UFvAgEu5KOk6WoWGY0ynuT+FPBUQuY0w=; fh=wMwPlu6s3WDa+luMUca6ONpSmNJKUwF5E3uCFeq1PI4=; b=PypN+WqyDfetixZpVdPQNBNuD5qYNSbfb0dfBiDxGA5pfRGczqdG4cd20O1LDR2ciq 2CHf/44dknJvRwh+pt9wTjGgjwTBqd40c0xva9KHLuhE45xkSQxKYxy3xKbkIqTqE4Fd LA4Cfsq0hbgSNu0ewQv0rRruAJECYQJ+Mb+miAouf33SrRPyDMV8V1EkkYJhOIzqi8oS aOEZb0MaC/bwZM9K2809UdHGw/5hDdC8wz3W2d8y3BqhmNOu8eKcJLYsJVq8TU/3jktt 4v6TMCF4Z1KXfb2y1NuqAWDTKh1QOXXhiiG4HEMhrHlICNjIlwuo0sQP+ehlX41tS16J QSXg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zn+ttxDX; 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 d75a77b69052e-46c87330ff4si102676691cf.53.2025.01.13.11.58.09 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jan 2025 11:58:09 -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=Zn+ttxDX; 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 1tXQXY-00062V-NZ; Mon, 13 Jan 2025 14:56:00 -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 1tXQXW-000624-P8 for qemu-devel@nongnu.org; Mon, 13 Jan 2025 14:55:58 -0500 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 <philmd@linaro.org>) id 1tXQXU-0007SO-5H for qemu-devel@nongnu.org; Mon, 13 Jan 2025 14:55:57 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4362bae4d7dso33945725e9.1 for <qemu-devel@nongnu.org>; Mon, 13 Jan 2025 11:55:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736798153; x=1737402953; 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=Jys96smoYe/UFvAgEu5KOk6WoWGY0ynuT+FPBUQuY0w=; b=Zn+ttxDXafHcLz1oYjOfSb+vy/5rludzVXCPKOpGgCpf2lr03TeWKFT3s78eYaAU7i 3zFSa7IsJCNtL2MKdqffiR0+A4FbyPPzcoRGRT6mW9/0P91GZpJcoUsvUNUdTGSVx82P awxMs7eWwLNPLZcwHo106E2wts20Flqd9XW3HDz/yqB2sP3hfpXzVjFFH1cKxTLv7QTn ckg7gId0sOvkwyaqrmrJpWiORfovjcGDYpie3dT3iPepSJKkUm1oQIGYJuCE9Nx9EUGa h5rmA6ka7H2P3PFQVW6CyGljsz425NqC8FNXKoc7QdlgEgxAr63+HxBzPwo+fyXhyk8f ocHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736798153; x=1737402953; 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=Jys96smoYe/UFvAgEu5KOk6WoWGY0ynuT+FPBUQuY0w=; b=CCksE/J9ixxjw1Edayo6gL1gqmsTZ51OlgBiCMFnwT1tDCUAT3uY2WYhOkvpKJOz7a GLTfAVaA1RxDUPkPOhQGKGhyRrhcosJj/L6wzDZW6V6oW/yfQn6VGS/Texyjxbz0qlfY 9Da+nV22clULv/i1pbq4ZAPO9e0OMdGXGbHWNz7b1b5R0PVNqOnrJS9enQ1UDPriDGIU OgDmegIoQnOswx1bFB1OIV4dkO+cMtWwjuzHBPWna2ezNgkdVex485gUCkjRuExaWuy9 HSzijHkfL4Wig4JivHjg8iGlxURY8/wZ86Ec5G1mXaSgn1lIzSoyB7BQ5tYgkSVSwGe1 naCQ== X-Gm-Message-State: AOJu0Yxx37TPh8sOUcu0FuK3rjoxeV4dmcmeLqJMKF/pDQUhmMEQDBYn cXxkYNi8Q7s2nM2ajolfZk0Y5o/Ucb8fnKgUGq/525Za8pS9Pf2AgYZxe3GFT2OoDCMRMoXgewh NK9A= X-Gm-Gg: ASbGncvBkSvtP/rKvK9MkJOw6+4c9mLXZOKYu4JT4dl+GdmXmzW4c7QG7N70M7+N1JT Uzis7mUGwdCtXiY/p1sWZqrzljw0HSGb0GBwiJSXZi3IZ4Pt43E8I28csZLJihaqeEsEXTwJVzt aNN0neDY9XdaiuDK71CU1S5f/tDRH+h185DwUHnS1q2WFvzEqDn+AGAtmj7FO0Mu/SKy5/btKDl crfw7B3QLo/UpD/s/P/2jR+NvvlnDthVOLuZgq62+i4Dx8K3B/ChvWUP7YKUbnd5VRuyqyqmWMa pqZBkeKy1g3oro3Ex1f9HQquTyR2In0= X-Received: by 2002:a05:6000:712:b0:388:da10:ff13 with SMTP id ffacd0b85a97d-38a87306e8bmr21535020f8f.21.1736798153020; Mon, 13 Jan 2025 11:55:53 -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-436e2dc0bb7sm185609735e9.16.2025.01.13.11.55.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Jan 2025 11:55:52 -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 05/19] hw/mips/malta: Propagate MaltaState to bl_setup_gt64120_jump_kernel() Date: Mon, 13 Jan 2025 20:55:11 +0100 Message-ID: <20250113195525.57150-6-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::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=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/malta.c b/hw/mips/malta.c index ec8fd954b4b..f7eb990c629 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -620,7 +620,8 @@ static void network_init(PCIBus *pci_bus) pci_init_nic_devices(pci_bus, "pcnet"); } -static void bl_setup_gt64120_jump_kernel(void **p, uint64_t run_addr, +static void bl_setup_gt64120_jump_kernel(MaltaState *s, void **p, + uint64_t run_addr, uint64_t kernel_entry) { static const char pci_pins_cfg[PCI_NUM_PINS] = { @@ -720,7 +721,7 @@ static void write_bootloader_nanomips(MaltaState *s, /* to_here: */ - bl_setup_gt64120_jump_kernel((void **)&p, run_addr, kernel_entry); + bl_setup_gt64120_jump_kernel(s, (void **)&p, run_addr, kernel_entry); } /* @@ -786,7 +787,7 @@ static void write_bootloader(MaltaState *s, * */ - bl_setup_gt64120_jump_kernel((void **)&p, run_addr, kernel_entry); + bl_setup_gt64120_jump_kernel(s, (void **)&p, run_addr, kernel_entry); /* YAMON subroutines */ p = (uint32_t *) (base + 0x800);
Propagate MaltaState to bl_setup_gt64120_jump_kernel() so it can access the MaltaState::cpus[] array. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/mips/malta.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)