From patchwork Sun Oct 25 13:14:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Wang X-Patchwork-Id: 270486 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07662C388F7 for ; Sun, 25 Oct 2020 13:16:01 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 573F020720 for ; Sun, 25 Oct 2020 13:16:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bytedance-com.20150623.gappssmtp.com header.i=@bytedance-com.20150623.gappssmtp.com header.b="Y7dUSpnU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 573F020720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWfsN-0001SK-EO for qemu-devel@archiver.kernel.org; Sun, 25 Oct 2020 09:15:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWfrB-0000Mf-Ho for qemu-devel@nongnu.org; Sun, 25 Oct 2020 09:14:45 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:44753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWfr6-0002NM-Sd for qemu-devel@nongnu.org; Sun, 25 Oct 2020 09:14:44 -0400 Received: by mail-pf1-x432.google.com with SMTP id f19so4600977pfj.11 for ; Sun, 25 Oct 2020 06:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=23AGIYOjutcJfv1ctNotYBakQrdg8uSFPn1/2ih38R8=; b=Y7dUSpnUwk1ZwIW4Y2x/5sL6/dnZ1WuvkoiQvRgK4luNpRKKLT2jpuCBmlDbEqU5Cy J+oRTZdgy3Zc6or8Fkn3r5l/zdN1smAIcO6xIbXW4Y6LjMsYcD4i3jz2AfumpbdTbydD xMkkLJECGN1xozJ4436ocU5rnfekuwCmtVSLdABsLGFr+wQMwVoqQb51nC+5KriOFKf3 pCJiYRizK+YmXKxNj6YQjW/3VGaCoFfOuXQ3fu0bTCP9D4BFM8wXDvxxn3D1P1QeE9Ce yg+ybXOLHK9Q5A51g3IbBjRgUfLeqsMjqR9LZM3M0tsRrqi58HLJipUnuhsiTg4dIaeo WpgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=23AGIYOjutcJfv1ctNotYBakQrdg8uSFPn1/2ih38R8=; b=gJ27JYLL+SoxnGuSgqyuqQB0aiFKTVKAf5eGuTjc1LkbgrgLPxPDcnlV8jMZ7xV+E5 naBmfzQMz9sVlQ8CUDHGk2eUg2m/er6wNye+X15JtGxMN6ftd8mn40XZE73pctJlGFMM L12DMRyzIQvloT71e4F9zN6zpP41VLt2n7j0oasMw7wTj7G9ffg6qc9UqQHv36FKUbzJ MBO7IvFt2dg93TLKeHk7LzBDvwzCcBYoagv4wzrrEe0TCcOmumCOGFWI9BYyZc54tdAV /F1lUF+ZvKiNGiW5AauA5vGsrWKl12fKanrLh4C7FmeMx0uJuSAB+kViwMwrcuX/m4hP 71CQ== X-Gm-Message-State: AOAM533c/m1POwk9stlYMAErk1DoGYfx5ZO1TVzpbPliomr9HPbXWHy6 gxnLvEC3KzabUSTtg+qIx8DzEQ== X-Google-Smtp-Source: ABdhPJwcKGw2lhIVQk07Ue035X6n9gZI2bXxbxW2EzIxhZb5v2s8vTpWKswlL/6l/gWQhI0GsU8Xuw== X-Received: by 2002:a62:7942:0:b029:162:bf9f:6457 with SMTP id u63-20020a6279420000b0290162bf9f6457mr2742748pfc.59.1603631679392; Sun, 25 Oct 2020 06:14:39 -0700 (PDT) Received: from localhost ([103.136.220.131]) by smtp.gmail.com with ESMTPSA id y1sm9813364pjl.12.2020.10.25.06.14.38 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 Oct 2020 06:14:39 -0700 (PDT) From: John Wang To: clg@kaod.org, xuxiaohan@bytedance.com, yulei.sh@bytedance.com, joel@jms.id.au, f4bug@amsat.org Subject: [PATCH v3 2/2] aspeed: Add support for the g220a-bmc board Date: Sun, 25 Oct 2020 13:14:35 +0000 Message-Id: <20201025131435.144-2-wangzhiqiang.bj@bytedance.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201025131435.144-1-wangzhiqiang.bj@bytedance.com> References: <20201025131435.144-1-wangzhiqiang.bj@bytedance.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=wangzhiqiang.bj@bytedance.com; helo=mail-pf1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Andrew Jeffery , Peter Maydell , "open list:ASPEED BMCs" , "open list:All patches CC here" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" G220A is a 2 socket x86 motherboard supported by OpenBMC. Strapping configuration was obtained from hardware. Signed-off-by: John Wang Reviewed-by: Cédric Le Goater Reviewed-by: Joel Stanley --- v3: - No changes v2: - No changes --- hw/arm/aspeed.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index bdb981d2f8..04c8ad2bcd 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -120,6 +120,20 @@ struct AspeedMachineState { SCU_AST2500_HW_STRAP_ACPI_ENABLE | \ SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER)) +#define G220A_BMC_HW_STRAP1 ( \ + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \ + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \ + SCU_AST2500_HW_STRAP_UART_DEBUG | \ + SCU_AST2500_HW_STRAP_RESERVED28 | \ + SCU_AST2500_HW_STRAP_DDR4_ENABLE | \ + SCU_HW_STRAP_2ND_BOOT_WDT | \ + SCU_HW_STRAP_VGA_CLASS_CODE | \ + SCU_HW_STRAP_LPC_RESET_PIN | \ + SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER) | \ + SCU_AST2500_HW_STRAP_SET_AXI_AHB_RATIO(AXI_AHB_RATIO_2_1) | \ + SCU_HW_STRAP_VGA_SIZE_SET(VGA_64M_DRAM) | \ + SCU_AST2500_HW_STRAP_RESERVED1) + /* Witherspoon hardware value: 0xF10AD216 (but use romulus definition) */ #define WITHERSPOON_BMC_HW_STRAP1 ROMULUS_BMC_HW_STRAP1 @@ -559,6 +573,30 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc) /* Bus 11: TODO ucd90160@64 */ } +static void g220a_bmc_i2c_init(AspeedMachineState *bmc) +{ + AspeedSoCState *soc = &bmc->soc; + DeviceState *dev; + + dev = DEVICE(i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), + "emc1413", 0x4c)); + object_property_set_int(OBJECT(dev), "temperature0", 31000, &error_abort); + object_property_set_int(OBJECT(dev), "temperature1", 28000, &error_abort); + object_property_set_int(OBJECT(dev), "temperature2", 20000, &error_abort); + + dev = DEVICE(i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), + "emc1413", 0x4c)); + object_property_set_int(OBJECT(dev), "temperature0", 31000, &error_abort); + object_property_set_int(OBJECT(dev), "temperature1", 28000, &error_abort); + object_property_set_int(OBJECT(dev), "temperature2", 20000, &error_abort); + + dev = DEVICE(i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 13), + "emc1413", 0x4c)); + object_property_set_int(OBJECT(dev), "temperature0", 31000, &error_abort); + object_property_set_int(OBJECT(dev), "temperature1", 28000, &error_abort); + object_property_set_int(OBJECT(dev), "temperature2", 20000, &error_abort); +} + static bool aspeed_get_mmio_exec(Object *obj, Error **errp) { return ASPEED_MACHINE(obj)->mmio_exec; @@ -798,6 +836,24 @@ static void aspeed_machine_tacoma_class_init(ObjectClass *oc, void *data) aspeed_soc_num_cpus(amc->soc_name); }; +static void aspeed_machine_g220a_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); + + mc->desc = "Bytedance G220A BMC (ARM1176)"; + amc->soc_name = "ast2500-a1"; + amc->hw_strap1 = G220A_BMC_HW_STRAP1; + amc->fmc_model = "n25q512a"; + amc->spi_model = "mx25l25635e"; + amc->num_cs = 2; + amc->macs_mask = ASPEED_MAC1_ON | ASPEED_MAC2_ON; + amc->i2c_init = g220a_bmc_i2c_init; + mc->default_ram_size = 1024 * MiB; + mc->default_cpus = mc->min_cpus = mc->max_cpus = + aspeed_soc_num_cpus(amc->soc_name); +}; + static const TypeInfo aspeed_machine_types[] = { { .name = MACHINE_TYPE_NAME("palmetto-bmc"), @@ -835,6 +891,10 @@ static const TypeInfo aspeed_machine_types[] = { .name = MACHINE_TYPE_NAME("tacoma-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_tacoma_class_init, + }, { + .name = MACHINE_TYPE_NAME("g220a-bmc"), + .parent = TYPE_ASPEED_MACHINE, + .class_init = aspeed_machine_g220a_class_init, }, { .name = TYPE_ASPEED_MACHINE, .parent = TYPE_MACHINE,