From patchwork Tue Mar 25 15:40:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 876017 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2725840wrb; Tue, 25 Mar 2025 08:43:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWqpsM/jNgrgHArK3Y1kEIbKmvfBgCQYstxAkNB0ecHzJXWlw6nzQiID53gArU4omL13fg+Vg==@linaro.org X-Google-Smtp-Source: AGHT+IHY/yzLuyyMcaS2h7oKCM3dR12Zij4ICJXU5dcwcCC2SsjK837UQ8KjgS7MXvj5HrBYBUFe X-Received: by 2002:a05:6214:1d04:b0:6e8:f2d2:f123 with SMTP id 6a1803df08f44-6eb3f2e1502mr266251266d6.13.1742917390072; Tue, 25 Mar 2025 08:43:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742917390; cv=none; d=google.com; s=arc-20240605; b=ZSm5BDaEp2BKPU6gJYPBcgrzTo8zwwy3+Cyt5nmx9Y43aIwOZhdZaI+K/tfh3vSGqt TY1nut6M0OICUtDcWlagxrTEVdwKWhHvUlKpTgw+hx/xrbLg6yzvyP7sPZav3lQXHxic C5lGPYZL4Mf35o8GosYD+rS/XXFDSkvGBrBsyqz3ximg0J9GPVcxdtQyGgFtHPmOhp24 jl1rXysIrOycTR5h6G4othDrvt0LKLojPbUeI1pFhpy43tTc9DgDCGgQzHhgjx0zOTnx ehvOXoTf1arZs96ystJMjt9KdCel0sBXWjjkTZ4JFsTerkKJ8iGtfTNEs6uK4/z5HXCF YBpA== 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=LLYIE82ADpP9MMv3tzyn92JCIJn6rh3Qqe+NEpTBgls=; fh=rsGnRer8RsnMMmJ84TrqvBI0/yOANo3p2sBxrPWKp1M=; b=Y0zb+Vbjf0s9CwbrNa2cWD4hnJ5OF75a1BfFd3UvdZ75qwSi88yp8Xvu2xVDiNzHxl u3JxV0bl8fZHhQxpOUE5RpLMUdqn6zkfXuNBHrVgUg/hzMkcg6as/t4EbqtLq+2GWRW5 LJUPiCCJLJ2UrDkH4YvqNeN1Lc6HiCHqossTe4XRhDWDquD8DiLRMi02hWQ+2yinrOex KEx64HolrHzUiHZqVaQ987sBEmszjVhhA4Ta6LyniqI8HsIbk+WH5q8QXlGv9jMvJ7UE GGRZO3JrOZqVzeoxRvxrTytZONxWEViVln4XuNo9hNrygeMkQzt9GiWbZCndsEcStauR 3vzw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mLzcgHji; 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: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3ef5aea2si98681426d6.129.2025.03.25.08.43.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Mar 2025 08:43:10 -0700 (PDT) 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=mLzcgHji; 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 ) id 1tx6PA-0003rT-AT; Tue, 25 Mar 2025 11:41:28 -0400 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 ) id 1tx6P7-0003qm-3v for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:25 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tx6P3-00047w-P3 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 11:41:24 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so53879235e9.3 for ; Tue, 25 Mar 2025 08:41:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742917280; x=1743522080; 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=LLYIE82ADpP9MMv3tzyn92JCIJn6rh3Qqe+NEpTBgls=; b=mLzcgHjimvDBBfsB8XrcP7/rupcg1tde2k/DjvMh7/813fK188SYe5uYQbLiQr1w9b rGlbPyH4/DbtdYP5ohbrvSMdy0JBpmjFyOxqXly0EftIl1iGvr8eVSpiWn66xrdT/LSB o+LI1/3T65HyejSLumjhT8/XdEX5jgpaA8TIsHitG+dfaJOnM7oeOjbqy8QVVaBTgMF5 mVNwM0bJmY3stFszSJFMwioBcMRUhwiJzUpcO4GqkmSFcOXT2w1hnDTiubdfT5fiasPN N4takroXKdZRk6KQ4GJoE2AhRLvvwIhDMzFfxS8qJA8RdQzaqphXr9JDdwFg6qJdbLxM tLKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742917280; x=1743522080; 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=LLYIE82ADpP9MMv3tzyn92JCIJn6rh3Qqe+NEpTBgls=; b=w+3654M6sF7AI/JkqDINTzQzMa92AyVYpH8vH2VLb6YoqUz9YD1OjCGvLOQMci0dvL R103H53qJPGjSDthhEzPALvM7KieRdQbM2hNZEVd5vvbhch851nZTvNkDogqPxrJhYOB A2t1olus+5mNizPqQru600W5zigLIjTKDGOS1VvZbRre8bkxSfUoHGR3Zo+Lu76RiDBk SBWJpSWcAMBZBNNL89P8t+LnIg0e9xkTbzHbNyACtvwu5NTeB97bUrv+Y1ObyL01ImtF umZQdRIlIbRBLiGwowg8/zYBbQRg7P9nSe74eBYdguyt9tqnlCcTDOl8LnTVugRJRFVw +lrA== X-Gm-Message-State: AOJu0Yw3HhjiYZ2KtqtXiwXPm/I22y3+zmgekSOUWnVUIyg9X+5EG4xI rPGgkaaiZj0W6GB3Vfr4KE7n8zXvdXS497YXKmDBixwz1qOlkaZRH8MKZJkXieS8T4PbTBDT0KU r X-Gm-Gg: ASbGncvYbG3Q0oFGEjVKtuvvxx5idEqfSirzj3YaAsRI//CfrBAbmBLuKE4G27fWp0h 9CMyGjd5yb/DG1EQ88z37tXVHZJg2MkBA+VSmLf/B4Tm0IztwhBztMigOuGz2Aby6CMgGu63LHw JwBq5BEyn4Fr0/shNXDvCuEC2yBOdJjVmI5vmG/JIgDxSkDrVhIwffLG+dAnPwZl0S+X8cscSxg ZQ5akYQWQ7EqcGwImMq7eBGE/onEd04RftUXAytN1D1fol1OVbDl/bNk75M7Ir9ycTt2/KZsfqI bKM8tdzcj7kJt+2XiTk97NFPUyEvCdw5m7CDEc8t8hBbW2MbJL87KnV8nOkNvB6Db2+ZHrzhFxE 4zC00RA22DRZSBqNJTwTg71uj+JrZJA== X-Received: by 2002:a05:600c:3c9e:b0:439:9424:1b70 with SMTP id 5b1f17b1804b1-43d50a4f8camr173393095e9.30.1742917279777; Tue, 25 Mar 2025 08:41:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3997f9ef098sm13767225f8f.84.2025.03.25.08.41.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Mar 2025 08:41:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Pierrick Bouvier , Zhao Liu , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?utf-8?q?Alex_Benn=C3=A9e?= , Anton Johansson Subject: [PATCH-for-10.1 4/8] target/mips: Prefix MMU API with 'mips_' Date: Tue, 25 Mar 2025 16:40:54 +0100 Message-ID: <20250325154058.92735-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250325154058.92735-1-philmd@linaro.org> References: <20250325154058.92735-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org MIPS MMU API declared in tcg-internal.h has public linkage. In order to avoid name clashing with other targets, prefix the API with 'mips_'. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- target/mips/tcg/tcg-internal.h | 2 +- target/mips/cpu.c | 2 +- target/mips/tcg/system/tlb_helper.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/mips/tcg/tcg-internal.h b/target/mips/tcg/tcg-internal.h index 74fc1309a71..a8bf2a5da40 100644 --- a/target/mips/tcg/tcg-internal.h +++ b/target/mips/tcg/tcg-internal.h @@ -45,7 +45,7 @@ void do_raise_exception(CPUMIPSState *env, void mips_cpu_do_interrupt(CPUState *cpu); bool mips_cpu_exec_interrupt(CPUState *cpu, int int_req); -void mmu_init(CPUMIPSState *env, const mips_def_t *def); +void mips_mmu_init(CPUMIPSState *env, const mips_def_t *def); void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask); diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 5ed6b3402d3..d8930468b7d 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -485,7 +485,7 @@ static void mips_cpu_realizefn(DeviceState *dev, Error **errp) env->exception_base = (int32_t)0xBFC00000; #if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) - mmu_init(env, env->cpu_model); + mips_mmu_init(env, env->cpu_model); #endif fpu_init(env, env->cpu_model); mvp_init(env); diff --git a/target/mips/tcg/system/tlb_helper.c b/target/mips/tcg/system/tlb_helper.c index ca4d6b27bc9..1ef2c32cfd4 100644 --- a/target/mips/tcg/system/tlb_helper.c +++ b/target/mips/tcg/system/tlb_helper.c @@ -466,7 +466,7 @@ static void r4k_mmu_init(CPUMIPSState *env, const mips_def_t *def) env->tlb->helper_tlbinvf = r4k_helper_tlbinvf; } -void mmu_init(CPUMIPSState *env, const mips_def_t *def) +void mips_mmu_init(CPUMIPSState *env, const mips_def_t *def) { env->tlb = g_malloc0(sizeof(CPUMIPSTLBContext));