From patchwork Mon Sep 30 12:53:22 2024 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: 831561 Delivered-To: patch@linaro.org Received: by 2002:a5d:66c8:0:b0:367:895a:4699 with SMTP id k8csp1931101wrw; Mon, 30 Sep 2024 05:54:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWEypgvjW2KZfgge8ZmFOymxaSZ9ss8J/Hf0nV1BDCiicQzSOMlRXY41ACmxeHeLmakN1fkxA==@linaro.org X-Google-Smtp-Source: AGHT+IGRb/jQtYOz2gJQIS6AmMahCas7xX4+zLpw+/NXP6P58Fl5eDIveADurUH8QsD0yfo1QVv/ X-Received: by 2002:a05:6102:3f55:b0:494:3a01:e363 with SMTP id ada2fe7eead31-4a2cefc88c5mr8196806137.5.1727700847657; Mon, 30 Sep 2024 05:54:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727700847; cv=none; d=google.com; s=arc-20240605; b=D5fQZU8RMMKVAJYnQgnZ2r6Y1zUISDkca0CxnEihrKdnVb3T6Nqo5TzfmltUq5WF4B GLtKCR3QZjA/QrUrlbDCfFLKIsI6v+EiTAWQOsFPBz2EQVeMxMNwve57kW66gUr3POXh NibB9eC2x1X+cZIQz44KWLxNS9rURsmzUqgH8JDv8oPpf81Tldc1je0XGgFmPFXehNbs xvqWgGKj4039lVPt8yPrG1D/nWTr58g8Y16SysoeRcVN3kPYkUwIKnvHDd36yL6XcLYN 7tzXebeoaBfX4X0FHx83bo3LZKLI4Bqi1Mz8fAY6Q3qb2Asbj4+H4qcrkwERu2uNKr4L GSSQ== 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=A54AZmXL2K4S/evyBU6Z+PuWbfLne3N1JrnXSUgIbU0=; fh=pIsvA++wNM3zvLRbteUQL1gnhGeE5D3wPSdvzpAWEQQ=; b=hqDTEvhHwd/eA8tgDzxmtQemBa9UeTGJPWAQJ7FlC9JKfs5GRQsG/aahqO1GCfnAcI 2lx4wLczpr4ppu7fWMINJD4tgrBuamhUA9LYi998AAyGlLPeXMAlj9smkKoB2m6NaHNx dDi4HS7KYkwvoMoy7HBNifPEaX8G4nk0zacPgcZjT58bFtuoonokBI7qOuDugd8EfPVg HnPgJXks5tB+eIEaAYb9WwgJkgW0Ofv/52MMy1rhtSlp9TphqHtMzrDGgRYrq+Jh/jiI +WMTh6ZhB8/vUKFM2lZDOK8sQYZzAbw/WCN5vAPtNbnJUb9sTNDoVECm0ykEZT1N5aOk lSLA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HNdzUcD4; 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 d75a77b69052e-45c9f34c312si80972861cf.398.2024.09.30.05.54.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Sep 2024 05:54:07 -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=HNdzUcD4; 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 1svFuG-0007eh-Cy; Mon, 30 Sep 2024 08:53:40 -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 1svFuE-0007W0-7x for qemu-devel@nongnu.org; Mon, 30 Sep 2024 08:53:38 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1svFuC-0006Wu-Q2 for qemu-devel@nongnu.org; Mon, 30 Sep 2024 08:53:37 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-37cd831ab06so1418699f8f.0 for ; Mon, 30 Sep 2024 05:53:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727700815; x=1728305615; 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=A54AZmXL2K4S/evyBU6Z+PuWbfLne3N1JrnXSUgIbU0=; b=HNdzUcD4gvsy9Ns/BR8ooXmFkvlNx2q/oMMNsz/qSsu8GHRUYoRpcOMeWUn3dXXHQg mf5piQpj5tuMcvWOOSkRl3340++lJ0d9DB4jrpXjoc9XgTl/Ni/5jvRCEllMWUeiUFoZ git3ZKWz1ipwDJCx02EGRNtZIWYTpiG4cFknajZr+fKpxkz7s4j56E/JeLoh7QGReEVx FlcWjyHVAeRkFCBYrj/1oW3awCmXhAxhqziwp5Xov8qaFA4HrDhr1SafPuCHmu5R8/Zp xxk6slTEBm9N2DqO/2sPPof9dk7tBrwHPV00HB7xtCgovrsbueZAWaBLTQotMwXvWgmI 3UmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727700815; x=1728305615; 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=A54AZmXL2K4S/evyBU6Z+PuWbfLne3N1JrnXSUgIbU0=; b=mrfops0Ryaunqb1y7FFe2Cq12ViI8BWPezI1T5t0bR+SpL3jAfutvtb9nnvsE4YBub 0qU+ufLckH/DcCPfs5Z0eXngZYE0u7m7roO3X/dqZpA8agLiRZJAhA+YdgPZZNFAn7R4 RN1Iuj4zTr+K2CWeWwOlnrNJRUNahxKUJsMiNjnYMgui36Bq4ju/o6jRzfZjAT0UaN17 pAsYQMBqkrYMypEfyXIoutn1VUnB9jqUq3hJfBLLcWGXQLJhvDsV8EXR38R0ISLSqTJy KSlLrlHVwSe1oJRw+712zhRx6TK6dNjwgoGdK6Mqx+84kgR6oMZRf291s8c+kNdRduX9 siBA== X-Gm-Message-State: AOJu0YzJmxfm35f9OdHspeJNRUK/4O6hB1LFF4ZEWoL/Y5btpLIL0HW8 Jj5vQbi0Y64u8ZuIFUJBeZXzgljVG1/VLw7zYiBpCJI/VHW7iLA/UfFeK29Yk9lY4JritK4vAgY wzqs= X-Received: by 2002:adf:f1ce:0:b0:371:82ec:206f with SMTP id ffacd0b85a97d-37cd5aa9c14mr6128167f8f.16.1727700815008; Mon, 30 Sep 2024 05:53:35 -0700 (PDT) Received: from localhost.localdomain ([78.196.4.158]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd57450c7sm8943227f8f.101.2024.09.30.05.53.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 30 Sep 2024 05:53:34 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Daniel Henrique Barboza , BALATON Zoltan , Nicholas Piggin , "Edgar E. Iglesias" , qemu-ppc@nongnu.org, Anton Johansson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/3] hw/ppc/sam460ex: Replace tswap32() by stl_endian_p() Date: Mon, 30 Sep 2024 14:53:22 +0200 Message-ID: <20240930125323.54671-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240930125323.54671-1-philmd@linaro.org> References: <20240930125323.54671-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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=unavailable 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 Replace the target-specific tswap32() call by stl_endian_p() which does the same but takes the endianness as argument, thus is target-agnostic. Get the vCPU endianness calling ppc_cpu_is_big_endian(). Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/sam460ex.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 8dc75fb9f0..6257ddbec6 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -248,10 +248,11 @@ static void mmubooke_create_initial_mapping(CPUPPCState *env, static void main_cpu_reset(void *opaque) { PowerPCCPU *cpu = opaque; + CPUState *cs = CPU(cpu); CPUPPCState *env = &cpu->env; struct boot_info *bi = env->load_info; - cpu_reset(CPU(cpu)); + cpu_reset(cs); /* either we have a kernel to boot or we jump to U-Boot */ if (bi->entry != UBOOT_ENTRY) { @@ -261,7 +262,7 @@ static void main_cpu_reset(void *opaque) /* Create a mapping for the kernel. */ mmubooke_create_initial_mapping(env, 0, 0); - env->gpr[6] = tswap32(EPAPR_MAGIC); + stl_endian_p(ppc_cpu_is_big_endian(cs), &env->gpr[6], EPAPR_MAGIC); env->gpr[7] = (16 * MiB) - 8; /* bi->ima_size; */ } else {