From nobody Thu Apr 25 23:53:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1618511246; cv=none; d=zohomail.com; s=zohoarc; b=bc6tp32wvLT6/cS/J/M7dPzlgZaAOAG8J+oAzcKubX+b4iDEfNv6X34jh2JnqXCQEy1kaswTI3xEjzs2+ocOqTtXLdW18Gmwt0uXQ5IFXkb8BjHyQd5pq6m2X8yUAhdoptLQCMO2io54g22etTcHv2bTLLEfrDZzdc6D3Bp9lq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618511246; h=Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=juT4twg37Pcety9e36P2vwj5M6pr9ePm6rB/ZDzuhtI=; b=O3d8bX2Wpu464DtTRXC1JU8stflp9hVhnZnU1OeEuR+JWjl+ewN5HCliftDsqMJFKsjzp1eELzIwlOfWtzoDkbWb0rGtee95DrqWmby5GlWfHI/HMvxtOvEbmmJQDYE7e87AV5M07NTmulkEf8K7OxqJMUnHwyMUrA0/L/Wx/4c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618511246031955.0103387195788; Thu, 15 Apr 2021 11:27:26 -0700 (PDT) Received: from localhost ([::1]:49696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lX6i4-00029o-3e for importer@patchew.org; Thu, 15 Apr 2021 14:27:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lX6ey-0000sz-JP for qemu-devel@nongnu.org; Thu, 15 Apr 2021 14:24:12 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:56038) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lX6ep-00013t-GX for qemu-devel@nongnu.org; Thu, 15 Apr 2021 14:24:12 -0400 Received: by mail-wm1-x32b.google.com with SMTP id n127so1190959wmb.5 for ; Thu, 15 Apr 2021 11:23:57 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id g9sm4182907wmh.21.2021.04.15.11.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Apr 2021 11:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=juT4twg37Pcety9e36P2vwj5M6pr9ePm6rB/ZDzuhtI=; b=A2rXsORHU+GxNuserKOfpcemw3DkjwSQnxJs/7t1y+pUcCHqzg2V1Thrm84McgKuQk uvjAJgSC/nsTl/yrz/pA8rPi8IoEw1bw01kqg59pjSAYJWPb0W6ssI9GW98R19onXXDq rpwWOIGG0vCDOh6eAKxxYE/J9KGBjSwWo/VHYFzZAgjItJ3/XJCc0HYhU7oQLIahlhiA bB4Wd3sNskN6JZFpOB8jBvmdOD5GnKdvOGHa2jaVGJlgQCv+wwODKsxh9nTYNau/2ML6 FPyXdbcOy/bWQP0b4X9GMYbUx9m67FEZMOJxMCd5YNF8s8MtxJHgW4kgUl08rSQJySUz 7hHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=juT4twg37Pcety9e36P2vwj5M6pr9ePm6rB/ZDzuhtI=; b=mauvGv1JDq5LnJm9DRGnjf2UMnBb5VVUFdSQ0mwUnm6kaXiFzG/vQP7s4zayIgO7eI szWKKIsSn+SfvInYLudSs2KsxJaxdCrU+XqHufP2dVvr2yN+JE633/xgnXmKYrj9KKhQ zqr2AArYUcQ0DbuamCafzhtswtno8b8UVqIiUzE0QIRfd4SnKf/nPQHlD7qGTbgpew/6 uZxPe9bt6v4otpcwrlwDPqOyzh79tqKUt03O85McAy73TX1m/L4HlTFvW+stMXPR5YvD 48qF2U6Q6MmNG3wVZ1b1J7lhQDC1Qj+uD3bvjwXC3upD/8Js5KLuVztOUm+v7pFG3d0l 8EPQ== X-Gm-Message-State: AOAM532s1pitNwis7ukFvN9yDbr1LIrpuwcEaZUE2az/T6JrikXLAsWq 5KAn0T4axaPRItCEML0Hwo09aA== X-Google-Smtp-Source: ABdhPJxwNscoPmnSAmIXU6h3B4FJJa+QGYRGK/RPHvQRx5++0Fgw4gSRueTYPjcaQoatQ6fZL5lvyQ== X-Received: by 2002:a1c:7207:: with SMTP id n7mr4320611wmc.11.1618511035791; Thu, 15 Apr 2021 11:23:55 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH for-6.0?] hw/arm/armsse: Give SSE-300 its own Property array Date: Thu, 15 Apr 2021 19:23:53 +0100 Message-Id: <20210415182353.8173-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" SSE-300 currently shares the SSE-200 Property array. This is bad principally because the default values of the CPU0_FPU and CPU0_DSP properties disable the FPU and DSP on the CPU. That is correct for the SSE-300 but not the SSE-200. Give the SSE-300 its own Property array with the correct SSE-300 specific settings: * SSE-300 has only one CPU, so no CPU1* properties * SSE-300 CPU has FPU and DSP Buglink: https://bugs.launchpad.net/qemu/+bug/1923861 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- This is a simple and pretty safe fix, but I don't think it quite merits doing an rc4 by itself. I think if we do an rc4 for some other reason it ought to go in, though. hw/arm/armsse.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index e5aeb9e485f..170dea8632d 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -84,7 +84,7 @@ static Property iotkit_properties[] =3D { DEFINE_PROP_END_OF_LIST() }; =20 -static Property armsse_properties[] =3D { +static Property sse200_properties[] =3D { DEFINE_PROP_LINK("memory", ARMSSE, board_memory, TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64), @@ -97,6 +97,17 @@ static Property armsse_properties[] =3D { DEFINE_PROP_END_OF_LIST() }; =20 +static Property sse300_properties[] =3D { + DEFINE_PROP_LINK("memory", ARMSSE, board_memory, TYPE_MEMORY_REGION, + MemoryRegion *), + DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64), + DEFINE_PROP_UINT32("SRAM_ADDR_WIDTH", ARMSSE, sram_addr_width, 15), + DEFINE_PROP_UINT32("init-svtor", ARMSSE, init_svtor, 0x10000000), + DEFINE_PROP_BOOL("CPU0_FPU", ARMSSE, cpu_fpu[0], true), + DEFINE_PROP_BOOL("CPU0_DSP", ARMSSE, cpu_dsp[0], true), + DEFINE_PROP_END_OF_LIST() +}; + static const ARMSSEDeviceInfo iotkit_devices[] =3D { { .name =3D "timer0", @@ -519,7 +530,7 @@ static const ARMSSEInfo armsse_variants[] =3D { .has_cpuid =3D true, .has_cpu_pwrctrl =3D false, .has_sse_counter =3D false, - .props =3D armsse_properties, + .props =3D sse200_properties, .devinfo =3D sse200_devices, .irq_is_common =3D sse200_irq_is_common, }, @@ -537,7 +548,7 @@ static const ARMSSEInfo armsse_variants[] =3D { .has_cpuid =3D true, .has_cpu_pwrctrl =3D true, .has_sse_counter =3D true, - .props =3D armsse_properties, + .props =3D sse300_properties, .devinfo =3D sse300_devices, .irq_is_common =3D sse300_irq_is_common, }, --=20 2.20.1