Received: by 2002:ac2:4c26:0:0:0:0:0 with SMTP id u6csp1621166lfq; Thu, 10 Sep 2020 13:07:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzw9aMPcq155t7ZDUnKubuB1TNtLIa4SY5G1Y55XcRjhLoP/v+1YVnuHGfAviBvU8Gy52j X-Received: by 2002:a25:664e:: with SMTP id z14mr15206983ybm.12.1599768454706; Thu, 10 Sep 2020 13:07:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599768454; cv=none; d=google.com; s=arc-20160816; b=AUbyG7RND72Y20gclqKH77jXw/bJQeItrRT+geIZ4XpSBuW/5bmehqmqWH8g7IkDb8 WL3CzA83kJkk/jZta4SQwppA057Bm4NBi64MYeMnrTlaQmUQQnhXdTCn0X3hPcM/SYKG 3+SZ8Dgakb8iVxJl9nCpTFIqAGSpEevGLFMyObpgBjuPFPLLP4x4R6tR2XH0soFBMVdw KoGZfKjSh3Av11LD49W3gKeQI/vRKC+bZyxc8jtw2px2eOIGvtRr0D0OrBmUAJkip91W oUcFF6L9kFbzTNgm9UdnHL9dXhS1SYvEwkzp4CpEqUMjrsvmA+9IvQ4bJ0jfe0f3bHoo f1rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from; bh=fW8bzViJ4jd05pRl/Y8evvWYM7mtG+uA4bF/5KP/HZo=; b=UptexeDiFbfiwLnZcKvjSg1Koi+2RZvJ3vy+y0w/gS/9lOZmfm12CtuGruIDUU6lSQ jL417d8pbkrZujPbhg0xYKN+8r9VSEssjfe1fQZv3xdw+AojnSgoDbJTTSDb6ip73mUQ D5iKwQaPt1MSJ1AdzMDAQ3hEb+ehZTSB5ZiFEqh2ixaiVkyr/iwnkoyUvtnkY7omJYHg QqzRC0RUCMImSc2yyshe7S5Gf/e+qCnB1qeSbrN10UczWRMEYcbvgAl32VPnEja/ADgq 9TWobcfcA2cxuNitNS4KzsVFm3els3QksTjrobmQTAJziosLE7v+fZIbhHCxYvfx2Wml VQCg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b2si10893yba.307.2020.09.10.13.07.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Sep 2020 13:07:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:60978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGSr0-0004ac-3R for alex.bennee@linaro.org; Thu, 10 Sep 2020 16:07:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGSqr-0004Yx-Pp; Thu, 10 Sep 2020 16:07:25 -0400 Received: from smtpout1.mo804.mail-out.ovh.net ([79.137.123.220]:37023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGSqp-0002uR-Od; Thu, 10 Sep 2020 16:07:25 -0400 Received: from mxplan5.mail.ovh.net (unknown [10.109.143.58]) by mo804.mail-out.ovh.net (Postfix) with ESMTPS id 4F5C6603C73F; Thu, 10 Sep 2020 22:07:19 +0200 (CEST) Received: from kaod.org (37.59.142.98) by DAG4EX1.mxp5.local (172.16.2.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2044.4; Thu, 10 Sep 2020 22:07:18 +0200 Authentication-Results: garm.ovh; auth=pass (GARM-98R00245ff655a-f162-458d-8800-140f58925766, 8FE11AEDAF16247B821E16C08928A26F58BE1972) smtp.auth=clg@kaod.org From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: Subject: [PATCH] hw/arm/aspeed: Add machine properties to define the flash models Date: Thu, 10 Sep 2020 22:07:15 +0200 Message-ID: <20200910200715.1920318-1-clg@kaod.org> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [37.59.142.98] X-ClientProxiedBy: DAG2EX1.mxp5.local (172.16.2.11) To DAG4EX1.mxp5.local (172.16.2.31) X-Ovh-Tracer-GUID: 1383795e-b39c-4a49-81a8-8f75bc232971 X-Ovh-Tracer-Id: 9760989245404711785 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduiedrudehjedgudeflecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkofggtgfgihesthekredtredtjeenucfhrhhomhepveorughrihgtucfnvgcuifhorghtvghruceotghlgheskhgrohgurdhorhhgqeenucggtffrrghtthgvrhhnpeefvdeutddvieekkeeuhfekudejjefggffghfetgfelgfevveefgefhvdegtdelveenucfkpheptddrtddrtddrtddpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepmhigphhlrghnhedrmhgrihhlrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegtlhhgsehkrghougdrohhrghdprhgtphhtthhopegtlhhgsehkrghougdrohhrgh Received-SPF: pass client-ip=79.137.123.220; envelope-from=clg@kaod.org; helo=smtpout1.mo804.mail-out.ovh.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 16:07:20 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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 , Andrew Jeffery , =?UTF-8?q?=E9=83=81=E9=9B=B7?= , qemu-arm@nongnu.org, Joel Stanley , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: k7ajk4xa5Jxz Some machines don't have much differences a part from the flash model being used. Introduce new machine properties to change them from the command line. Cc: 郁雷 Signed-off-by: Cédric Le Goater --- hw/arm/aspeed.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 8bfb1c79ddc5..bdb981d2f878 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -41,6 +41,8 @@ struct AspeedMachineState { MemoryRegion ram_container; MemoryRegion max_ram; bool mmio_exec; + char *fmc_model; + char *spi_model; }; /* Palmetto hardware value: 0x120CE416 */ @@ -332,8 +334,10 @@ static void aspeed_machine_init(MachineState *machine) "max_ram", max_ram_size - ram_size); memory_region_add_subregion(&bmc->ram_container, ram_size, &bmc->max_ram); - aspeed_board_init_flashes(&bmc->soc.fmc, amc->fmc_model); - aspeed_board_init_flashes(&bmc->soc.spi[0], amc->spi_model); + aspeed_board_init_flashes(&bmc->soc.fmc, bmc->fmc_model ? + bmc->fmc_model : amc->fmc_model); + aspeed_board_init_flashes(&bmc->soc.spi[0], bmc->spi_model ? + bmc->spi_model : amc->spi_model); /* Install first FMC flash content as a boot rom. */ if (drive0) { @@ -570,6 +574,34 @@ static void aspeed_machine_instance_init(Object *obj) ASPEED_MACHINE(obj)->mmio_exec = false; } +static char *aspeed_get_fmc_model(Object *obj, Error **errp) +{ + AspeedMachineState *bmc = ASPEED_MACHINE(obj); + return g_strdup(bmc->fmc_model); +} + +static void aspeed_set_fmc_model(Object *obj, const char *value, Error **errp) +{ + AspeedMachineState *bmc = ASPEED_MACHINE(obj); + + g_free(bmc->fmc_model); + bmc->fmc_model = g_strdup(value); +} + +static char *aspeed_get_spi_model(Object *obj, Error **errp) +{ + AspeedMachineState *bmc = ASPEED_MACHINE(obj); + return g_strdup(bmc->spi_model); +} + +static void aspeed_set_spi_model(Object *obj, const char *value, Error **errp) +{ + AspeedMachineState *bmc = ASPEED_MACHINE(obj); + + g_free(bmc->spi_model); + bmc->spi_model = g_strdup(value); +} + static void aspeed_machine_class_props_init(ObjectClass *oc) { object_class_property_add_bool(oc, "execute-in-place", @@ -577,6 +609,15 @@ static void aspeed_machine_class_props_init(ObjectClass *oc) aspeed_set_mmio_exec); object_class_property_set_description(oc, "execute-in-place", "boot directly from CE0 flash device"); + + object_class_property_add_str(oc, "fmc-model", aspeed_get_fmc_model, + aspeed_set_fmc_model); + object_class_property_set_description(oc, "fmc-model", + "Change the FMC Flash model"); + object_class_property_add_str(oc, "spi-model", aspeed_get_spi_model, + aspeed_set_spi_model); + object_class_property_set_description(oc, "spi-model", + "Change the SPI Flash model"); } static int aspeed_soc_num_cpus(const char *soc_name) -- 2.25.4