From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 52F9DC47422 for ; Fri, 26 Jan 2024 16:37:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTPCY-0004KV-2y; Fri, 26 Jan 2024 11:37:10 -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 1rTPCS-0004FT-Jd for qemu-devel@nongnu.org; Fri, 26 Jan 2024 11:37:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTPCP-0005G3-8E for qemu-devel@nongnu.org; Fri, 26 Jan 2024 11:37:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706287020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=yHJA/a7AtrkrA1dPhXzDTAA1K342Bby9O7QNX8c10rA=; b=UQhqKM/0Bmp7yJhzNc/m8TPNYJThlE6aruZ8/onIo7dA+0M39gaNuEQcjzHOCm6xLJDx85 ExkaOaQ3h5lqCBHDt0zIp++6UDwUdwxg6rN6B/1pzLE1Wid0TTX8FZhDBRqXN8pj/NEySt b+khXDZOzFnH9YIithOKQUyRtKJ9ezs= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-373-pq-wt8hCNVu82PaKyMyofA-1; Fri, 26 Jan 2024 11:36:58 -0500 X-MC-Unique: pq-wt8hCNVu82PaKyMyofA-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-6800e52d47aso39114476d6.1 for ; Fri, 26 Jan 2024 08:36:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706287018; x=1706891818; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yHJA/a7AtrkrA1dPhXzDTAA1K342Bby9O7QNX8c10rA=; b=L7t76Sp3PVgHEQkdR4PPo0EjqoJKMG3bm/q26Tg9B/UYVLxTcVNWEFA054iKMSdxoC hKQ2HQudDiC+Sc2RU22Fq4/AosjAUye0tToUd4cuAopZDd5lpeNgN7f39fMrSEsRc7vJ mniOIB3Kqbt789CXXrb4wHotaJJhDBDXIh33QEHA2Wj5ihfCK5w5fjwqPvK0xXFsLVwm fZDN4jZO4UiNv6DGHaYSwwhAzv+om+ou6KZUMGPLLs8vmmypFTh2mberoQpR+wfNPwhN h61TEeZuPcvdX+jGuPECn26LvmYu/cbsXakO0nXrw0YIhjgs16T6TvidkicZDuzQcfW7 mWww== X-Gm-Message-State: AOJu0Ywpq1WxF+vkJqOCBmvGyVwLF0dIcFmt5ysqfq/p55iwsKqE/nxo NTWf1p+Tq4MhJxuK0qWF6BtLB+uUtj42ts7ElATQYDH2aHkfDcwQY9fcb/6sbP7zAU9V/tMkzGK KLVbE5+juMJGmBM6smA3jxgsakD/A+CM0V+D4ZRXn02n0eXaxJb2h X-Received: by 2002:a05:6214:d6d:b0:68c:3504:19a1 with SMTP id 13-20020a0562140d6d00b0068c350419a1mr152688qvs.32.1706287018238; Fri, 26 Jan 2024 08:36:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFEYqONftzwFkQaen4n9m6+D/pp+9cG9WOY8KzIaN5G9jpk3hXZtBk78M0Jq+/+iQBTnpZlqg== X-Received: by 2002:a05:6214:d6d:b0:68c:3504:19a1 with SMTP id 13-20020a0562140d6d00b0068c350419a1mr152658qvs.32.1706287017965; Fri, 26 Jan 2024 08:36:57 -0800 (PST) Received: from [192.168.0.9] (ip-109-43-176-119.web.vodafone.de. [109.43.176.119]) by smtp.gmail.com with ESMTPSA id od10-20020a0562142f0a00b0068c37c745f4sm146555qvb.21.2024.01.26.08.36.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Jan 2024 08:36:57 -0800 (PST) Message-ID: Date: Fri, 26 Jan 2024 17:36:53 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 39/46] hw/riscv: use qemu_configure_nic_device() Content-Language: en-US To: David Woodhouse , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Peter Maydell , Jiaxun Yang , =?UTF-8?Q?Herv=C3=A9_Poussineau?= , Aleksandar Rikalo , Aurelien Jarno , Jason Wang , Jia Liu , Stafford Horne , Daniel Henrique Barboza , Bin Meng , Palmer Dabbelt , Weiwei Li , Liu Zhiwei , Artyom Tarasenko , Stefano Stabellini , David Woodhouse References: <20240108204909.564514-1-dwmw2@infradead.org> <20240108204909.564514-40-dwmw2@infradead.org> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20240108204909.564514-40-dwmw2@infradead.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-1.313, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 08/01/2024 21.27, David Woodhouse wrote: > From: David Woodhouse > > Signed-off-by: David Woodhouse > --- > hw/riscv/microchip_pfsoc.c | 14 ++------------ > hw/riscv/sifive_u.c | 7 +------ > 2 files changed, 3 insertions(+), 18 deletions(-) > > diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c > index b775aa8946..7725dfbde5 100644 > --- a/hw/riscv/microchip_pfsoc.c > +++ b/hw/riscv/microchip_pfsoc.c > @@ -202,7 +202,6 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) > MemoryRegion *envm_data = g_new(MemoryRegion, 1); > MemoryRegion *qspi_xip_mem = g_new(MemoryRegion, 1); > char *plic_hart_config; > - NICInfo *nd; > int i; > > sysbus_realize(SYS_BUS_DEVICE(&s->e_cpus), &error_abort); > @@ -411,17 +410,8 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) > memmap[MICROCHIP_PFSOC_USB].size); > > /* GEMs */ > - > - nd = &nd_table[0]; > - if (nd->used) { > - qemu_check_nic_model(nd, TYPE_CADENCE_GEM); > - qdev_set_nic_properties(DEVICE(&s->gem0), nd); > - } > - nd = &nd_table[1]; > - if (nd->used) { > - qemu_check_nic_model(nd, TYPE_CADENCE_GEM); > - qdev_set_nic_properties(DEVICE(&s->gem1), nd); > - } > + qemu_configure_nic_device(DEVICE(&s->gem0), true, NULL); > + qemu_configure_nic_device(DEVICE(&s->gem1), true, NULL); > > object_property_set_int(OBJECT(&s->gem0), "revision", GEM_REVISION, errp); > object_property_set_int(OBJECT(&s->gem0), "phy-addr", 8, errp); > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index ec76dce6c9..5207ec1fa5 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -789,7 +789,6 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp) > MemoryRegion *l2lim_mem = g_new(MemoryRegion, 1); > char *plic_hart_config; > int i, j; > - NICInfo *nd = &nd_table[0]; > > qdev_prop_set_uint32(DEVICE(&s->u_cpus), "num-harts", ms->smp.cpus - 1); > qdev_prop_set_uint32(DEVICE(&s->u_cpus), "hartid-base", 1); > @@ -893,11 +892,7 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp) > } > sysbus_mmio_map(SYS_BUS_DEVICE(&s->otp), 0, memmap[SIFIVE_U_DEV_OTP].base); > > - /* FIXME use qdev NIC properties instead of nd_table[] */ > - if (nd->used) { > - qemu_check_nic_model(nd, TYPE_CADENCE_GEM); > - qdev_set_nic_properties(DEVICE(&s->gem), nd); > - } > + qemu_configure_nic_device(DEVICE(&s->gem), true, NULL); > object_property_set_int(OBJECT(&s->gem), "revision", GEM_REVISION, > &error_abort); > if (!sysbus_realize(SYS_BUS_DEVICE(&s->gem), errp)) { Reviewed-by: Thomas Huth