From patchwork Tue Nov 21 10:24:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 745691 Delivered-To: patch@linaro.org Received: by 2002:a5d:5052:0:b0:32d:baff:b0ca with SMTP id h18csp1793265wrt; Tue, 21 Nov 2023 02:26:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZEXCK4gCcPTvUz9RxqKgZhS1wHM9OKMUYFlx61ozVRBmgqBfTBfXj3rWyteNhW6YCZxXP X-Received: by 2002:a05:6102:20d1:b0:462:a548:9bff with SMTP id i17-20020a05610220d100b00462a5489bffmr4192325vsr.35.1700562384843; Tue, 21 Nov 2023 02:26:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700562384; cv=none; d=google.com; s=arc-20160816; b=lYUhELqMdL+nFdmBo3KK17FrbIuMYmpA89QgkNSjmKfR8GdNxmK3Ik58xQ8wbOgUE5 J+CEcbg+Vhfkb0aYzx7rpMh3p77NjxWbOY6bjOy9QvLjNnsvoMBNMoRAz0TtvTxsvuAt NV987xMg7wowY2hC6uZ/I13qf5mUaidAW3syISfNePLld7xYRAnv1nkRrbiWlZ13Ayxw CVa4JHuWrNvTpSuGT7+ouHNsfvW+5dNWwrQT+le/MpnRRXLyWwUAoayRLqBwUH5UnRYa yTaOF8j0iTNo0gKQDLPwJPCSCbp3/C9FlychrjUKFWTdmyltOsQS84vd5rgyAHLtXEXq oapQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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 :dkim-signature; bh=uKQw+Bk5quR0x5DmJj6cUhmxTm7kP9pkGDcsohAx+Rw=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=fpSrUiILx1spHoi+fC5dobD5DhhcfLmbiKbKBsODJ0zBygzkugdMWxDRAf3LTyoJZo F0AxOdEfqkAZPnJx/tcRF0z4XNl8U0ZYUcekh9vVfWehtHm8pByGdvIdnkxk6BViRJ9W axli7Lm2RgT4Ize2ZK9LbQ2ZG6Pnm8jWi46FWbPQA4+TSRneTGP1T3m6wzuX5QC5jFE2 C14+auiS5063dlb+LTY1LzrV3+Fx4z/0C2zmWO8weppvFuLClL+GwkHyk1Iw6BPk3rTD vrbeGnSHYFZgeMj//fturSJUX4sc+t4TSO9FaS2ZuDvEgh3LBRHLl9Mrbiu07TLRMuK8 71IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qlDE5VNq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w32-20020a05622a192000b00417b523872dsi9459761qtc.621.2023.11.21.02.26.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Nov 2023 02:26:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qlDE5VNq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5Nw7-0004Mo-MH; Tue, 21 Nov 2023 05:24:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5Nw4-0004KQ-69 for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:24:52 -0500 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r5Nw1-0007FI-1Z for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:24:51 -0500 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2c5056059e0so72475951fa.3 for ; Tue, 21 Nov 2023 02:24:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700562287; x=1701167087; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uKQw+Bk5quR0x5DmJj6cUhmxTm7kP9pkGDcsohAx+Rw=; b=qlDE5VNqkspa2ktpqDG357XZ1KO9wJXPcJ0wIyeBiaoQNz/X/kqsYdHhIxNhbTOqrm 6PJvX/PO+vmKEKZMxMTCpCxsVaSvEKb6J31xfDpCaQxVzhrxUQ/pWK/+ABgwUCWwRyy7 3VBydexpiTS2IXqWVLWtgcCfCG3KZhfPQMrP5JPzVMXWZA/xiDRxkG01VVcMRTSh1ec8 snvKiKDpr8RO7EnObYKbxUPrRpweUgHzWZLls8AOkJa0vny+DpEMTafCX57p+C1ayYXy 5kqq6inmmE4c03CsDSqEFe6KRQmQj45Q5VCDWBTAaaYnz6cHxVM8DK0tIp0jwMvnHaFL 2iOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700562287; x=1701167087; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uKQw+Bk5quR0x5DmJj6cUhmxTm7kP9pkGDcsohAx+Rw=; b=m/CwxQDIn1X/EBl3Xw7zROBl3lKmUq6A7VzNU81zZUBTzWd19ggkF66Ipa7+R0zDV5 wT8gsfGvRcv0gOoKI05C72306eBQhH+HyQ5ihVYYeJXQJywpFAssVIe2Kw6Vj3JasK2E J8+i8YKoi7AhTtgiQWUMLPCiRJDb8DFB9jhsNe9Z81DaUqrqWtlHQJaErJjHU7gH9e+f HfbSAqDTAVefvzAQMJcVGY5bfo2A5UGwM8JYf1+m9wcH0mkTexVKedITWISvVASy5ABC NkripJlNHiOzZMrqFkUuvUKGCDBwQZ/DSYtA5jH3donHAtXNXOpDESsPnK+lZaLOrx+H l44A== X-Gm-Message-State: AOJu0Yy4TrHs7fWjXjdL7Msqjuh1i82bgCw3N2CkGZFCBOM+KVoqEaja 6eIuatzVrQvv3f8a37mFZkc6WbX6P2iLVCZlGug= X-Received: by 2002:a2e:9217:0:b0:2c7:f9d:587c with SMTP id k23-20020a2e9217000000b002c70f9d587cmr6370929ljg.24.1700562287146; Tue, 21 Nov 2023 02:24:47 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n25-20020a05600c181900b00405442edc69sm20450835wmp.14.2023.11.21.02.24.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 02:24:46 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 8/8] hw/arm/fsl-imx: Do not ignore Error argument Date: Tue, 21 Nov 2023 10:24:41 +0000 Message-Id: <20231121102441.3872902-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231121102441.3872902-1-peter.maydell@linaro.org> References: <20231121102441.3872902-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22a; envelope-from=peter.maydell@linaro.org; helo=mail-lj1-x22a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Both i.MX25 and i.MX6 SoC models ignore the Error argument when setting the PHY number. Pick &error_abort which is the error used by the i.MX7 SoC (see commit 1f7197deb0 "ability to change the FEC PHY on i.MX7 processor"). Fixes: 74c1330582 ("ability to change the FEC PHY on i.MX25 processor") Fixes: a9c167a3c4 ("ability to change the FEC PHY on i.MX6 processor") Signed-off-by: Philippe Mathieu-Daudé Message-id: 20231120115116.76858-1-philmd@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/fsl-imx25.c | 3 ++- hw/arm/fsl-imx6.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 24c43745903..9aabbf7f587 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -169,7 +169,8 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) epit_table[i].irq)); } - object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num, &err); + object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num, + &error_abort); qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]); if (!sysbus_realize(SYS_BUS_DEVICE(&s->fec), errp)) { diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 4fa7f0b95ed..7dc42cbfe64 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -379,7 +379,8 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) spi_table[i].irq)); } - object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num, &err); + object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num, + &error_abort); qdev_set_nic_properties(DEVICE(&s->eth), &nd_table[0]); if (!sysbus_realize(SYS_BUS_DEVICE(&s->eth), errp)) { return;