From patchwork Fri Feb 19 14:43:49 2021 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: 1442259 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; 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=dME+3uf2; 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 4DhvVc526Tz9sRR for ; Sat, 20 Feb 2021 01:44:40 +1100 (AEDT) Received: from localhost ([::1]:54590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD71K-0000gE-M1 for incoming@patchwork.ozlabs.org; Fri, 19 Feb 2021 09:44:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD70e-0000cc-0I; Fri, 19 Feb 2021 09:43:56 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:38340) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lD70c-0002LC-EK; Fri, 19 Feb 2021 09:43:55 -0500 Received: by mail-wr1-x42d.google.com with SMTP id b3so8871994wrj.5; Fri, 19 Feb 2021 06:43:53 -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:mime-version :content-transfer-encoding; bh=aHCgSRZLeBErlxsFQTR8al0Db1JIpta/9oAzTWbZfz0=; b=dME+3uf2unXI3bFqf152S2zkPGamHWDasjHkpnz0XsqQ4lo2GTcJc8VP9yn1eUvGtz QfW+Em4/8EuQySdzLQyMx/SrB9SIpcCxCVZvi+zyn1ZVKqjQxx8sSNkJq7Ctc03uYA+9 Kh+Ir74tVNmEkC2uMj6x1+fbNp9GPkw3yqMCIsiuc0kSa9IxQEfM8/TVPZEkws7Vcg65 L62hgtReQAVK09BPs0LiUjAbeV/azI1pN+MCmxVOsTbREdNRm+Jwj266p4DQWSZM61uB s/zumAH5jCugMO5EF+JmIcwwgowAonDNIlIrm42iawapG6PXVLrQNpeNwg6+5QlHHdNv 7j/g== 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 :mime-version:content-transfer-encoding; bh=aHCgSRZLeBErlxsFQTR8al0Db1JIpta/9oAzTWbZfz0=; b=nfF6M+B7O93nrsDSXyBiBJVmJ2dgYTiNbNHG441as/cFx7gwSs+tkedxLY+P4r3hZI Ytl6ZgBa0MJ5XGn/nkO63fVlVncKXEL3fogGpgXxDnANUhFdQVcZOD5A0zcIDPkHoVnw sWlUOMF0kaR0iPU1+HC5QTOdtzIIRn1ZXO/x+udHPnaYGUgY1jvdQCDbTm8ze4rAHBEr 4FTrG5yMTDboAhRt92SQwfelvIv+5rFp4MBCcLah1rmYmTW3TPfvCY3TaE/aauq4ETAo bvpDlClklMdI/AjIdqoFjwlWjWfCOnVXQfKG07tpJUNN3tt0PdQ83YgqSTZZRKFhpE2x aEYw== X-Gm-Message-State: AOAM533sdd7cjzOjGA/MozROmso9QzENiXcsKip6rW9LRCpjE8skiFr8 iLLiQ3DkNL1AYFNuzg5CVrRPDs2I9ao= X-Google-Smtp-Source: ABdhPJzmyc+xESg1uMCEnz1jxJM6yoGNe1+rFK+utpWsQdqoUJd5+nk1sC0rnVPYESehCFr/p9Njqg== X-Received: by 2002:adf:ce06:: with SMTP id p6mr7924067wrn.406.1613745831840; Fri, 19 Feb 2021 06:43:51 -0800 (PST) Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id v11sm14007744wrr.3.2021.02.19.06.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Feb 2021 06:43:51 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2] hw/arm/xlnx-zynqmp: Remove obsolete 'has_rpu' property Date: Fri, 19 Feb 2021 15:43:49 +0100 Message-Id: <20210219144350.1979905-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Peter Maydell , Thomas Huth , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , qemu-arm@nongnu.org, "Edgar E. Iglesias" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We hint the 'has_rpu' property is no longer required since commit 6908ec448b4 ("xlnx-zynqmp: Properly support the smp command line option") which was released in QEMU v2.11.0. Beside, this device is marked 'user_creatable = false', so the only thing that could be setting the property is the board code that creates the device. Since the property is not user-facing, we can remove it without going through the deprecation process. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- v2: Reworded per Peter suggestion --- include/hw/arm/xlnx-zynqmp.h | 2 -- hw/arm/xlnx-zynqmp.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 6f45387a173..0678b419a23 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -115,8 +115,6 @@ struct XlnxZynqMPState { bool secure; /* Has the ARM Virtualization extensions? */ bool virt; - /* Has the RPU subsystem? */ - bool has_rpu; /* CAN bus. */ CanBusState *canbus[XLNX_ZYNQMP_NUM_CAN]; diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 881847255b4..46030c1ef81 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -443,11 +443,6 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) } } - if (s->has_rpu) { - info_report("The 'has_rpu' property is no longer required, to use the " - "RPUs just use -smp 6."); - } - xlnx_zynqmp_create_rpu(ms, s, boot_cpu, &err); if (err) { error_propagate(errp, err); @@ -646,7 +641,6 @@ static Property xlnx_zynqmp_props[] = { DEFINE_PROP_STRING("boot-cpu", XlnxZynqMPState, boot_cpu), DEFINE_PROP_BOOL("secure", XlnxZynqMPState, secure, false), DEFINE_PROP_BOOL("virtualization", XlnxZynqMPState, virt, false), - DEFINE_PROP_BOOL("has_rpu", XlnxZynqMPState, has_rpu, false), DEFINE_PROP_LINK("ddr-ram", XlnxZynqMPState, ddr_ram, TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_LINK("canbus0", XlnxZynqMPState, canbus[0], TYPE_CAN_BUS,