From patchwork Sat Feb 8 16:56:35 2020 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: 1235339 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ijJgiTKH; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48FJP45Z75z9sPK for ; Sun, 9 Feb 2020 04:02:00 +1100 (AEDT) Received: from localhost ([::1]:43378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j0TUU-0004jk-Ku for incoming@patchwork.ozlabs.org; Sat, 08 Feb 2020 12:01:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53756) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j0TPo-0005Yq-1v for qemu-devel@nongnu.org; Sat, 08 Feb 2020 11:57:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j0TPm-0001fX-Vk for qemu-devel@nongnu.org; Sat, 08 Feb 2020 11:57:07 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42572) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j0TPm-0001f3-PX; Sat, 08 Feb 2020 11:57:06 -0500 Received: by mail-wr1-x442.google.com with SMTP id k11so2466522wrd.9; Sat, 08 Feb 2020 08:57:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ARVdXcT1NUZV1xpoAwVDWgKAlJcTG5+YbJyusfS3GjE=; b=ijJgiTKHPkl0o8pwZXJeJc1kNWcCUxWxXvDUnNyveK4yvd+icdEum0EEEThDv7VJDM iNnCFW2kpLyu2Ku0M6i62CqVde6Cgtm9TtTq682nphG4PtUTfNm9wYEkTHXL2NyxCW9z 1uE2HhCCWrlE3dIgFO2q9nBfzeLq1vC46uBZM2WCXUMRnd205caOVDD1Yhng57pkijNU rYC3KhZ9QpQNTYwlWUcZXwYqznQ1KyA3nSigI7QA6iUykXgcrhsYg8IGXzST812I3N2+ JAkchoet2ynUjZSm4AeZSdQvZ2kqPKp5ipyPRoCJkSkHEWy19SL12HLrk5tn5yppVZps MP1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ARVdXcT1NUZV1xpoAwVDWgKAlJcTG5+YbJyusfS3GjE=; b=rNiEsGccgE3RUv/07B58a3PLY5R/UERstmuHVdeWGO2m3zBUZKyMLp6Fx/i9Fi4yNg /mJLOGSNMHYaSIMtC1D5u7V7Omi5HVyrrrpSpUYwwTdrDsuZ3BdZ9dqFDclO6QR3InOu VCAr6FZaAk4UI3EPbA6E9yOq69j4nzeED36Jfj9Zx1XyX7IQB96jUe0gXE+YSL8Sp76g mvKIv003MLy6WlfKuCwAve5XQ1/IUBT2WOwTZkiG5NILxGpUqr1gsSqF+C7gEUZP8vyg KFCCg+n/HgOmHRFk6YJkO8IichWMxzI0E8wUGI1+nwvGoZW7dSyN4O5WvpmWOFcV3iiH HFeQ== X-Gm-Message-State: APjAAAX4uJwg6h+0117iiksPnyxyAtcafDCy9mS/mN+ksmXbQb4nWp75 stHkNYdeRI7YtULbOn4BeYskUP/R X-Google-Smtp-Source: APXvYqwnP/wvp6aHo+8Q37idXC6lsQN8OJb9+ce5fAUBbek4gLD7JLpGyHgR25nZ5TOGiBwF6XSTdQ== X-Received: by 2002:a5d:56ca:: with SMTP id m10mr6312639wrw.313.1581181025603; Sat, 08 Feb 2020 08:57:05 -0800 (PST) Received: from localhost.localdomain (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id a5sm7872763wmb.37.2020.02.08.08.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2020 08:57:05 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 03/13] hw/arm/raspi: Extract the version from the board revision Date: Sat, 8 Feb 2020 17:56:35 +0100 Message-Id: <20200208165645.15657-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200208165645.15657-1-f4bug@amsat.org> References: <20200208165645.15657-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Joaquin de Andres , Alistair Francis , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Andrew Baumann , Esteban Bosse , Niek Linnenbank , qemu-arm@nongnu.org, Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The board revision encode the board version. Add a helper to extract the version, and use it. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/raspi.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 818146fdbb..f285e2988f 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/arm/bcm2836.h" +#include "hw/registerfields.h" #include "qemu/error-report.h" #include "hw/boards.h" #include "hw/loader.h" @@ -37,6 +38,28 @@ typedef struct RasPiState { MemoryRegion ram; } RasPiState; +/* + * Board revision codes: + * www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/ + */ +FIELD(REV_CODE, REVISION, 0, 4); +FIELD(REV_CODE, TYPE, 4, 8); +FIELD(REV_CODE, PROCESSOR, 12, 4); +FIELD(REV_CODE, MANUFACTURER, 16, 4); +FIELD(REV_CODE, MEMORY_SIZE, 20, 3); +FIELD(REV_CODE, STYLE, 23, 1); + +static int board_processor_id(uint32_t board_rev) +{ + assert(FIELD_EX32(board_rev, REV_CODE, STYLE)); /* Only new style */ + return FIELD_EX32(board_rev, REV_CODE, PROCESSOR); +} + +static int board_version(uint32_t board_rev) +{ + return board_processor_id(board_rev) + 1; +} + static void write_smpboot(ARMCPU *cpu, const struct arm_boot_info *info) { static const uint32_t smpboot[] = { @@ -164,9 +187,10 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size) arm_load_kernel(ARM_CPU(first_cpu), machine, &binfo); } -static void raspi_init(MachineState *machine, int version) +static void raspi_init(MachineState *machine, uint32_t board_rev) { RasPiState *s = g_new0(RasPiState, 1); + int version = board_version(board_rev); uint32_t vcram_size; DriveInfo *di; BlockBackend *blk; @@ -192,7 +216,6 @@ static void raspi_init(MachineState *machine, int version) /* Setup the SOC */ object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram), &error_abort); - int board_rev = version == 3 ? 0xa02082 : 0xa21041; object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev", &error_abort); object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort); @@ -216,7 +239,7 @@ static void raspi_init(MachineState *machine, int version) static void raspi2_init(MachineState *machine) { - raspi_init(machine, 2); + raspi_init(machine, 0xa21041); } static void raspi2_machine_init(MachineClass *mc) @@ -238,7 +261,7 @@ DEFINE_MACHINE("raspi2", raspi2_machine_init) #ifdef TARGET_AARCH64 static void raspi3_init(MachineState *machine) { - raspi_init(machine, 3); + raspi_init(machine, 0xa02082); } static void raspi3_machine_init(MachineClass *mc)