Received: by 2002:adf:ef42:0:0:0:0:0 with SMTP id c2csp899114wrp; Wed, 25 Sep 2019 07:56:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqwGWq3KO7Z6anrrwrkM/m+H9lPgFm1ldOfmdDfsp4PLArt2R90Pjyf0VG5LFgS0xQWO6r9f X-Received: by 2002:a50:ed82:: with SMTP id h2mr3424073edr.206.1569423360991; Wed, 25 Sep 2019 07:56:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569423360; cv=none; d=google.com; s=arc-20160816; b=tObah3BCa97YmZnIJo86toPPp9Qt/MDpPks1X4cggkHq0LFFEAeO4lwViMOu83tdCz WnPa1IkT5J7zVFSO1MJNVNCZcjwSxfeHPsN1udXHcthBNyhQPSH7EnnCSwQBnpfR6krp nhfr3Xx7wpehVfytx+qnplydY1trsa5Zpu2vk4gxSFGEdJsygfp/cnU3sVLSJUUy+/ss xOazHv6H08nzk5p5KO5dr+SypmqJrxA5Tel1tvuFvxwILlC/EGpE6cbicJts9xp7d/D8 FC5elKdSLTr6eogTR159995SgQQ3gZ97yasIw8r2wLKY5R3M/jNQTFKdtSdwQn+5akta Qlrg== 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:references:in-reply-to:message-id:date:subject:to:from; bh=x9Sz2JQuTa8WqDlTTePTZuOGbBI5eMelK2OqtPf6zn0=; b=LRKu8eigJIsIgg71SAMrsVawe3ojJU0FJkABd4pz+vp2v9opOt28+CylfY1l9fAaLe mju2qJp3gcvxS5nOcV/8yKbElUhQhao4HCzeUgfkk+ZdM1TRTm/RakoMrTut8BUaiiVk s0+GhoznalCXZV90Oa6NNv4788bH6ApXHMq9dNygtT/xor6vbKXYPKampJA+itze4/47 h/ht16sKZ7CN+OQiDWdve8bocwZDC3m4lpm4RFLLTcPVIoSHidhLAMqpnjaJqyVbczpT NGIXg36TT7c/O6ZcFhPf4T6NVnte0zGV0xpSZIOJbKq0mxBq5L2BlXybVlu/tXzZEEDq lRoA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-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 h12si2939733ejj.40.2019.09.25.07.56.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Sep 2019 07:56:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-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-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:53188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD8hz-0000xa-Bk for alex.bennee@linaro.org; Wed, 25 Sep 2019 10:55:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52974) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD8OA-0005Mo-3P for qemu-devel@nongnu.org; Wed, 25 Sep 2019 10:35:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iD8O8-0001j7-QV for qemu-devel@nongnu.org; Wed, 25 Sep 2019 10:35:29 -0400 Received: from 2.mo178.mail-out.ovh.net ([46.105.39.61]:58635) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iD8O8-0001iD-L8 for qemu-devel@nongnu.org; Wed, 25 Sep 2019 10:35:28 -0400 Received: from player786.ha.ovh.net (unknown [10.108.42.88]) by mo178.mail-out.ovh.net (Postfix) with ESMTP id 13CB579A60 for ; Wed, 25 Sep 2019 16:35:27 +0200 (CEST) Received: from kaod.org (lfbn-1-2229-223.w90-76.abo.wanadoo.fr [90.76.50.223]) (Authenticated sender: clg@kaod.org) by player786.ha.ovh.net (Postfix) with ESMTPSA id 87A94A4D4345; Wed, 25 Sep 2019 14:35:20 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: Peter Maydell Subject: [PATCH v2 21/23] aspeed: Parameterise number of MACs Date: Wed, 25 Sep 2019 16:32:46 +0200 Message-Id: <20190925143248.10000-22-clg@kaod.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190925143248.10000-1-clg@kaod.org> References: <20190925143248.10000-1-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Ovh-Tracer-Id: 8876031916005886737 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrfedvgdejlecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.39.61 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 , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Joel Stanley Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: 60Q2kIjFiZ7/ From: Joel Stanley To support the ast2600's four MACs allow SoCs to specify the number they have, and create that many. Signed-off-by: Joel Stanley [clg: - included a check on sc->macs_num when realizing the macs - included interrupt definitions for the AST2600 ] Signed-off-by: C=C3=A9dric Le Goater --- include/hw/arm/aspeed_soc.h | 5 ++++- hw/arm/aspeed_ast2600.c | 10 ++++++++-- hw/arm/aspeed_soc.c | 6 ++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index 67c59956f835..088a5d108185 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -30,7 +30,7 @@ #define ASPEED_SPIS_NUM 2 #define ASPEED_WDTS_NUM 4 #define ASPEED_CPUS_NUM 2 -#define ASPEED_MACS_NUM 2 +#define ASPEED_MACS_NUM 4 =20 typedef struct AspeedSoCState { /*< private >*/ @@ -69,6 +69,7 @@ typedef struct AspeedSoCClass { uint64_t sram_size; int spis_num; int wdts_num; + int macs_num; const int *irqmap; const hwaddr *memmap; uint32_t num_cpus; @@ -114,6 +115,8 @@ enum { ASPEED_I2C, ASPEED_ETH1, ASPEED_ETH2, + ASPEED_ETH3, + ASPEED_ETH4, ASPEED_SDRAM, ASPEED_XDMA, }; diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index a4f0fafab7cb..25d2c2d05d63 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -32,7 +32,9 @@ static const hwaddr aspeed_soc_ast2600_memmap[] =3D { [ASPEED_SPI1] =3D 0x1E630000, [ASPEED_SPI2] =3D 0x1E641000, [ASPEED_ETH1] =3D 0x1E660000, + [ASPEED_ETH3] =3D 0x1E670000, [ASPEED_ETH2] =3D 0x1E680000, + [ASPEED_ETH4] =3D 0x1E690000, [ASPEED_VIC] =3D 0x1E6C0000, [ASPEED_SDMC] =3D 0x1E6E0000, [ASPEED_SCU] =3D 0x1E6E2000, @@ -88,6 +90,9 @@ static const int aspeed_soc_ast2600_irqmap[] =3D { [ASPEED_I2C] =3D 110, /* 110 -> 125 */ [ASPEED_ETH1] =3D 2, [ASPEED_ETH2] =3D 3, + [ASPEED_ETH3] =3D 32, + [ASPEED_ETH4] =3D 33, + }; =20 static qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int ctrl) @@ -173,7 +178,7 @@ static void aspeed_soc_ast2600_init(Object *obj) OBJECT(&s->scu), &error_abort); } =20 - for (i =3D 0; i < ASPEED_MACS_NUM; i++) { + for (i =3D 0; i < sc->macs_num; i++) { sysbus_init_child_obj(obj, "ftgmac100[*]", OBJECT(&s->ftgmac100[= i]), sizeof(s->ftgmac100[i]), TYPE_FTGMAC100); } @@ -397,7 +402,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *d= ev, Error **errp) } =20 /* Net */ - for (i =3D 0; i < nb_nics; i++) { + for (i =3D 0; i < nb_nics && i < sc->macs_num; i++) { qdev_set_nic_properties(DEVICE(&s->ftgmac100[i]), &nd_table[i]); object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "aspeed= ", &err); @@ -470,6 +475,7 @@ static void aspeed_soc_ast2600_class_init(ObjectClass= *oc, void *data) sc->sram_size =3D 0x10000; sc->spis_num =3D 2; sc->wdts_num =3D 4; + sc->macs_num =3D 4; sc->irqmap =3D aspeed_soc_ast2600_irqmap; sc->memmap =3D aspeed_soc_ast2600_memmap; sc->num_cpus =3D 2; diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index a063be9fd795..6defb143acde 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -198,7 +198,7 @@ static void aspeed_soc_init(Object *obj) OBJECT(&s->scu), &error_abort); } =20 - for (i =3D 0; i < ASPEED_MACS_NUM; i++) { + for (i =3D 0; i < sc->macs_num; i++) { sysbus_init_child_obj(obj, "ftgmac100[*]", OBJECT(&s->ftgmac100[= i]), sizeof(s->ftgmac100[i]), TYPE_FTGMAC100); } @@ -372,7 +372,7 @@ static void aspeed_soc_realize(DeviceState *dev, Erro= r **errp) } =20 /* Net */ - for (i =3D 0; i < nb_nics; i++) { + for (i =3D 0; i < nb_nics && i < sc->macs_num; i++) { qdev_set_nic_properties(DEVICE(&s->ftgmac100[i]), &nd_table[i]); object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "aspeed= ", &err); @@ -455,6 +455,7 @@ static void aspeed_soc_ast2400_class_init(ObjectClass= *oc, void *data) sc->sram_size =3D 0x8000; sc->spis_num =3D 1; sc->wdts_num =3D 2; + sc->macs_num =3D 2; sc->irqmap =3D aspeed_soc_ast2400_irqmap; sc->memmap =3D aspeed_soc_ast2400_memmap; sc->num_cpus =3D 1; @@ -478,6 +479,7 @@ static void aspeed_soc_ast2500_class_init(ObjectClass= *oc, void *data) sc->sram_size =3D 0x9000; sc->spis_num =3D 2; sc->wdts_num =3D 3; + sc->macs_num =3D 2; sc->irqmap =3D aspeed_soc_ast2500_irqmap; sc->memmap =3D aspeed_soc_ast2500_memmap; sc->num_cpus =3D 1; --=20 2.21.0