From patchwork Tue Aug 10 03:57:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 12427751 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 7B1ACC4338F for ; Tue, 10 Aug 2021 03:58:52 +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 C51F560F8F for ; Tue, 10 Aug 2021 03:58:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C51F560F8F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:59590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDIug-00022c-IF for qemu-devel@archiver.kernel.org; Mon, 09 Aug 2021 23:58:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDIti-00019n-K3; Mon, 09 Aug 2021 23:57:50 -0400 Received: from mail-ot1-x32d.google.com ([2607:f8b0:4864:20::32d]:37790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDItg-00017P-VX; Mon, 09 Aug 2021 23:57:50 -0400 Received: by mail-ot1-x32d.google.com with SMTP id v24-20020a0568300918b02904f3d10c9742so17235999ott.4; Mon, 09 Aug 2021 20:57:47 -0700 (PDT) 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=rS/7i3KindezxRe9g1hVBP/26sJAIOp7n+LWpi6n8B4=; b=BPCumjmaoOhr9sja5BosRM1nxe4sv6SvzBbxU/x/I5DjPJ7XQKrE8VAphBeF7pkt2s PLgRg7/52XslT8tleP67qMKv+cyPrQGQvcKgdTHpcu8biyVFhgrHTm2I7IZbA89lr1Mq pumlHk4hNvu3OkJvIzxIh3P+TcGhzrq0NO/PnjMvAZYZF8ZBbPaflGVS8QkvpjpfEVHT Gw2Tp4w9u0XaPbTnMKlqLsI6ebqNKa4ocKb0WKQpQPBK6F+PQSmP5Mk8NYPrHkXxiys3 8gNEOvHGC1JjmdoHcinaAQRiEGUSDebTG816VzqJrLR5wh+gU2KN2paJARwQsNci5fhC GXiQ== 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=rS/7i3KindezxRe9g1hVBP/26sJAIOp7n+LWpi6n8B4=; b=n+ysiHKMXtcLRzf05RfMt6hgfySf0KLU0rUo5suXxzrVZsa3J7ZGelH13QPFcWuamJ 0hsGk8cE8J7RvrrfBzhdotB5v3aCXNAXvedG9sSGlIn89nGX6kwT8Q9/fU1pze8+e26q URsqVQm4jgscZFO1k/MSJSAGw91EboiEKhWYN39kC+byfdxPIvfn7FJW2EK4MbT4kG9o RYR10JjaeQCv6YetY94njMjcA+OOk5xKgkdBD8oXMdDZDnXa9CO62xOTZi5t81cltMcj komcFF/EwHamsir2KScuVpkisdj2lGqzbqH3nCO44SbfOitdAlC42Q/tjhw+Gldt102X GA5A== X-Gm-Message-State: AOAM530XWxiZvjPXSoUMFkaC0B60U6iMqGGwP4sD54wwH5EMmFXTjnqU 12SKjFUCQ77MMAImNXOoyEk= X-Google-Smtp-Source: ABdhPJySieMPkjyrTtOz73YMJPLiDMvAVs8EZH1T0U2Q3hlAb9tXpC7M7udThJ8jMBw3BpdENKN7hg== X-Received: by 2002:a05:6830:1511:: with SMTP id k17mr1504368otp.19.1628567866922; Mon, 09 Aug 2021 20:57:46 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id t24sm1043135oou.48.2021.08.09.20.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Aug 2021 20:57:46 -0700 (PDT) From: Guenter Roeck To: =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PATCH] hw: arm: aspeed: Enable mac0/1 instead of mac1/2 for g220a Date: Mon, 9 Aug 2021 20:57:42 -0700 Message-Id: <20210810035742.550391-1-linux@roeck-us.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::32d; envelope-from=groeck7@gmail.com; helo=mail-ot1-x32d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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 , Andrew Jeffery , qemu-devel@nongnu.org, qemu-arm@nongnu.org, Joel Stanley , Guenter Roeck Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" According to its dts file in the Linux kernel, we need mac0 and mac1 enabled instead of mac1 and mac2. Also, g220a is based on aspeed-g5 (ast2500) which doesn't even have the third interface. Signed-off-by: Guenter Roeck Reviewed-by: Cédric Le Goater --- hw/arm/aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index ecf0c9cfac..20e3a77160 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -997,7 +997,7 @@ static void aspeed_machine_g220a_class_init(ObjectClass *oc, void *data) amc->fmc_model = "n25q512a"; amc->spi_model = "mx25l25635e"; amc->num_cs = 2; - amc->macs_mask = ASPEED_MAC1_ON | ASPEED_MAC2_ON; + amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->i2c_init = g220a_bmc_i2c_init; mc->default_ram_size = 1024 * MiB; mc->default_cpus = mc->min_cpus = mc->max_cpus =