[{"id":1766714,"web_url":"http://patchwork.ozlabs.org/comment/1766714/","msgid":"<1505200428.4080.4.camel@aj.id.au>","list_archive_url":null,"date":"2017-09-12T07:13:48","subject":"Re: [PATCH qemu] aspeed: add support for the witherspoon-bmc board","submitter":{"id":68332,"url":"http://patchwork.ozlabs.org/api/people/68332/","name":"Andrew Jeffery","email":"andrew@aj.id.au"},"content":"On Mon, 2017-09-11 at 11:16 +0200, Cédric Le Goater wrote:\n> The Witherspoon boards are OpenPOWER system hosting a POWER9\n> Processor. Let's add support for their BMC including a couple\n> of I2C devices as found on real HW.\n> \n> Signed-off-by: Cédric Le Goater <clg@kaod.org>\n\nThanks, applied to master.\n\nAndrew\n\n> ---\n>  hw/arm/aspeed.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n>  1 file changed, 62 insertions(+)\n> \n> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c\n> index 02c0c1613c86..484ae1003d26 100644\n> --- a/hw/arm/aspeed.c\n> +++ b/hw/arm/aspeed.c\n> @@ -46,6 +46,7 @@ enum {\n>      PALMETTO_BMC,\n>      AST2500_EVB,\n>      ROMULUS_BMC,\n> +    WITHERSPOON_BMC,\n>  };\n>  \n>  /* Palmetto hardware value: 0x120CE416 */\n> @@ -83,9 +84,13 @@ enum {\n>          SCU_AST2500_HW_STRAP_ACPI_ENABLE |                              \\\n>          SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER))\n>  \n> +/* Witherspoon hardware value: 0xF10AD216 (but use romulus definition) */\n> +#define WITHERSPOON_BMC_HW_STRAP1 ROMULUS_BMC_HW_STRAP1\n> +\n>  static void palmetto_bmc_i2c_init(AspeedBoardState *bmc);\n>  static void ast2500_evb_i2c_init(AspeedBoardState *bmc);\n>  static void romulus_bmc_i2c_init(AspeedBoardState *bmc);\n> +static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc);\n>  \n>  static const AspeedBoardConfig aspeed_boards[] = {\n>      [PALMETTO_BMC] = {\n> @@ -112,6 +117,14 @@ static const AspeedBoardConfig aspeed_boards[] = {\n>          .num_cs    = 2,\n>          .i2c_init  = romulus_bmc_i2c_init,\n>      },\n> +    [WITHERSPOON_BMC]  = {\n> +        .soc_name  = \"ast2500-a1\",\n> +        .hw_strap1 = WITHERSPOON_BMC_HW_STRAP1,\n> +        .fmc_model = \"mx25l25635e\",\n> +        .spi_model = \"mx66l1g45g\",\n> +        .num_cs    = 2,\n> +        .i2c_init  = witherspoon_bmc_i2c_init,\n> +    },\n>  };\n>  \n>  #define FIRMWARE_ADDR 0x0\n> @@ -347,11 +360,60 @@ static const TypeInfo romulus_bmc_type = {\n>      .class_init = romulus_bmc_class_init,\n>  };\n>  \n> +static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc)\n> +{\n> +    AspeedSoCState *soc = &bmc->soc;\n> +    DeviceState *dev;\n> +    uint8_t *eeprom_buf = g_malloc0(8 * 1024);\n> +\n> +    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 3), \"pca9552\", 0x60);\n> +\n> +    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), \"tmp423\", 0x4c);\n> +    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 5), \"tmp423\", 0x4c);\n> +\n> +    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 9), \"tmp105\", 0x4a);\n> +\n> +    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), \"rx8900\", 0x32);\n> +    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11), \"pca9552\",\n> +                     0x60);\n> +\n> +    dev = qdev_create((BusState *) aspeed_i2c_get_bus(DEVICE(&soc->i2c), 11),\n> +                      \"smbus-eeprom\");\n> +    qdev_prop_set_uint8(dev, \"address\", 0x51);\n> +    qdev_prop_set_ptr(dev, \"data\", eeprom_buf);\n> +    qdev_init_nofail(dev);\n> +}\n> +\n> +static void witherspoon_bmc_init(MachineState *machine)\n> +{\n> +    aspeed_board_init(machine, &aspeed_boards[WITHERSPOON_BMC]);\n> +}\n> +\n> +static void witherspoon_bmc_class_init(ObjectClass *oc, void *data)\n> +{\n> +    MachineClass *mc = MACHINE_CLASS(oc);\n> +\n> +    mc->desc = \"OpenPOWER Witherspoon BMC (ARM1176)\";\n> +    mc->init = witherspoon_bmc_init;\n> +    mc->max_cpus = 1;\n> +    mc->no_sdcard = 1;\n> +    mc->no_floppy = 1;\n> +    mc->no_cdrom = 1;\n> +    mc->no_parallel = 1;\n> +}\n> +\n> +static const TypeInfo witherspoon_bmc_type = {\n> +    .name = MACHINE_TYPE_NAME(\"witherspoon-bmc\"),\n> +    .parent = TYPE_MACHINE,\n> +    .class_init = witherspoon_bmc_class_init,\n> +};\n> +\n>  static void aspeed_machine_init(void)\n>  {\n>      type_register_static(&palmetto_bmc_type);\n>      type_register_static(&ast2500_evb_type);\n>      type_register_static(&romulus_bmc_type);\n> +    type_register_static(&witherspoon_bmc_type);\n>  }\n>  \n>  type_init(aspeed_machine_init)","headers":{"Return-Path":"<openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>","X-Original-To":["incoming@patchwork.ozlabs.org","openbmc@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","openbmc@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrwyY29zrz9s83\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 12 Sep 2017 17:14:13 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xrwyY12gTzDrJJ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 12 Sep 2017 17:14:13 +1000 (AEST)","from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com\n\t[66.111.4.25])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xrwyD67FYzDrJn\n\tfor <openbmc@lists.ozlabs.org>; Tue, 12 Sep 2017 17:13:56 +1000 (AEST)","from compute4.internal (compute4.nyi.internal [10.202.2.44])\n\tby mailout.nyi.internal (Postfix) with ESMTP id 91E8E20C37;\n\tTue, 12 Sep 2017 03:13:53 -0400 (EDT)","from frontend1 ([10.202.2.160])\n\tby compute4.internal (MEProxy); Tue, 12 Sep 2017 03:13:54 -0400","from keelia16 (ppp14-2-0-125.bras21.adl4.internode.on.net\n\t[14.2.0.125])\n\tby mail.messagingengine.com (Postfix) with ESMTPA id 56ADF7F066;\n\tTue, 12 Sep 2017 03:13:52 -0400 (EDT)"],"Authentication-Results":["ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=aj.id.au header.i=@aj.id.au header.b=\"tRlUTKns\";\n\tdkim=pass (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com header.b=\"ou9P0UzN\"; \n\tdkim-atps=neutral","lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=aj.id.au header.i=@aj.id.au header.b=\"tRlUTKns\";\n\tdkim=pass (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com header.b=\"ou9P0UzN\"; \n\tdkim-atps=neutral","ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=aj.id.au\n\t(client-ip=66.111.4.25; helo=out1-smtp.messagingengine.com;\n\tenvelope-from=andrew@aj.id.au; receiver=<UNKNOWN>)","lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=aj.id.au header.i=@aj.id.au header.b=\"tRlUTKns\";\n\tdkim=pass (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com\n\theader.b=\"ou9P0UzN\"; dkim-atps=neutral"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=aj.id.au; h=\n\tcontent-type:date:from:in-reply-to:message-id:mime-version\n\t:references:subject:to:x-me-sender:x-me-sender:x-sasl-enc\n\t:x-sasl-enc; s=fm1; bh=W1yi1YDx4TwO+yTBNUQmwpucPE6QMeHFsBLCYuU50\n\tLQ=; b=tRlUTKnsu2v/YLc4qlvBmnvzeKu7VOrU+MtkynURdNC3+7pgJnSIZr533\n\tGJm5E8ma/hSt5HR19zZN5BreGQI3EvlFL4zdJqHsoQvLGL87x6aOVjVfKPZVTYLB\n\t0y6ao6lMWCe1BefHBkRSOBmbVQmrJNWJqwKg+vTwa+oCkqtZ7VC2CTlbCQ2+DcWS\n\tMNAGKUlXbiIV3Qh9/wTLEG2ex/D+l9oiMFMlXLwqKGPLuC/QsLZlZecNS1+ZkRLl\n\tQtL4bP+PUnRh1W5dvQLiIj22qM/gtRCduKGBzbzzcBqUHdWBu2K7wU0h/yn2LSZD\n\tpyQ3DusHRH8SA8OZ7rTs22fEPDUCQ==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n\tmessagingengine.com; h=content-type:date:from:in-reply-to\n\t:message-id:mime-version:references:subject:to:x-me-sender\n\t:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=W1yi1YDx4TwO+yTBNU\n\tQmwpucPE6QMeHFsBLCYuU50LQ=; b=ou9P0UzN0c47takMipNUZyazOOJS0eis1w\n\tw62/s0vMIeGujQs7EXETwJA6iKn+NRLk8YIXyP1qjifv2fqDXakKtdWWZCta6Sh2\n\tSOMj51QsIp4p4wL4pcQF7l0sdIoIeMn0ZioKn7Spli+tlCs0RwZLeTtuRpvznMRh\n\tw0onwfQy136QA9/nExY4A/ZMnGj8Kmux8dYuutuLFi11BLmVuLeQD5vOGf0C6gxw\n\tXAUBzw3jkMOUi9mufiFNhVKj4am5fneGhX00SSAIDdIXzdSjVAGwqGTIckGST2x4\n\tT1R6YjIb3bbhIBHDwppw916fuvlCkHb6wLoxuVb2jqqwapYWgXZQ=="],"X-ME-Sender":"<xms:MYm3WXXQwa4Mx4GOwtLTr74VrdUb5vIQDQEBsl58C07egDYpkQd_Ag>","X-Sasl-enc":"iCCU7ESGCKCiUX6T5S08kStqfUWvybfcH5w2BxhXAccG 1505200432","Message-ID":"<1505200428.4080.4.camel@aj.id.au>","Subject":"Re: [PATCH qemu] aspeed: add support for the witherspoon-bmc board","From":"Andrew Jeffery <andrew@aj.id.au>","To":"=?iso-8859-1?q?C=E9dric?= Le Goater <clg@kaod.org>,\n\topenbmc@lists.ozlabs.org","Date":"Tue, 12 Sep 2017 16:43:48 +0930","In-Reply-To":"<20170911091643.25203-1-clg@kaod.org>","References":"<20170911091643.25203-1-clg@kaod.org>","Content-Type":"multipart/signed; micalg=\"pgp-sha512\";\n\tprotocol=\"application/pgp-signature\";\n\tboundary=\"=-zXBsJhgga28m+uosaAI7\"","X-Mailer":"Evolution 3.22.6-1ubuntu1 ","Mime-Version":"1.0","X-BeenThere":"openbmc@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Development list for OpenBMC <openbmc.lists.ozlabs.org>","List-Unsubscribe":"<https://lists.ozlabs.org/options/openbmc>,\n\t<mailto:openbmc-request@lists.ozlabs.org?subject=unsubscribe>","List-Archive":"<http://lists.ozlabs.org/pipermail/openbmc/>","List-Post":"<mailto:openbmc@lists.ozlabs.org>","List-Help":"<mailto:openbmc-request@lists.ozlabs.org?subject=help>","List-Subscribe":"<https://lists.ozlabs.org/listinfo/openbmc>,\n\t<mailto:openbmc-request@lists.ozlabs.org?subject=subscribe>","Errors-To":"openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org","Sender":"\"openbmc\"\n\t<openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>"}}]