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 X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 5E712C4338F for ; Tue, 27 Jul 2021 04:25:52 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8439E60FED for ; Tue, 27 Jul 2021 04:25:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8439E60FED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A60583343; Tue, 27 Jul 2021 06:25:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EOxZmHX+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5A13D8334F; Tue, 27 Jul 2021 06:25:47 +0200 (CEST) Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D470C83333 for ; Tue, 27 Jul 2021 06:25:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rfried.dev@gmail.com Received: by mail-ot1-x32e.google.com with SMTP id 48-20020a9d0bb30000b02904cd671b911bso12317470oth.1 for ; Mon, 26 Jul 2021 21:25:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=K47juz6FEQNui79NWobrJGFkU+OjH6s8mKcJ/8wkENg=; b=EOxZmHX+IWlo8L2RRMMawzI7b1PGgRPoMXIXVs8iq/ai3/ITEmM3cXZF1B6DyV+PEA fxe8BcuJmEE1EgO/2jHNIXY/RpK/f1WuVh2XNv1o6a1iz3p+Gnn4VAN+z8ZvEkht/jnf qUdb09pycI0chucmoy1AnCgMZknAl4arU1QUr/+dc/a6K15Kq0xW3QUxrf1k3psKt6C2 t+w1w5ygKBmU4LNqcF7iIUgIe3MRikztYC9FcQOhh6RnV+uIRTx6i/eZN0d1WjgHQVBr yhSXnrE9pDCeF7ndoRgz/d8+cylIZk7TejJi4T+NayGZCWETlPLaXZGFgVktgrK/Unv5 1g+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=K47juz6FEQNui79NWobrJGFkU+OjH6s8mKcJ/8wkENg=; b=Fa445OzVCOuAfpOPdxv7ULaJI4GAYAVQ/9A5xnCwkQ8/cIQ88HwqRvKacrnn9lFyjO w3hSirVwsBKc19oud62C5D2vZnGsaJfW0vEloE/CzQWEjgUnZqUIeXWzJaJaUCST3BOh 2Q/sv8UpplgxiAKgn5bnwk9z7r2nwL618Z5BoVhtohoybRIdV3g0ISWwfEDmY90Ft3aZ MsQ0jVzGep/1IDsGEgQLTtsYRiIO5eBH2943QOSehYha/Arq9KLHYz1wy3Ef8k4RwoKB 4BuYVfaYoksk1UYXsFAiwGCVEWsQ/hL5kg259Wc7Lmbj8wwQE/xfWxeY7+2HBbKfXl09 nRmg== X-Gm-Message-State: AOAM531ZXefqQQIvmbn7+namiTEm73oyva55TZc+oybWerirHbCpkqaD 01NCmodDukOnPti0mFtxQ7UAaRsa7XHSzHY/3+I= X-Google-Smtp-Source: ABdhPJyyv5B0vmG8WjVXrDn0JF1YqCWDbzy20m6uPmXPP7V2v910Y/trh8al23ryoy+f2sKwNtMi6Mmyh37yQpt6Tb0= X-Received: by 2002:a9d:7e6:: with SMTP id 93mr14716768oto.370.1627359939166; Mon, 26 Jul 2021 21:25:39 -0700 (PDT) MIME-Version: 1.0 References: <20210726133440.634682-1-sjg@chromium.org> <20210726133440.634682-23-sjg@chromium.org> In-Reply-To: <20210726133440.634682-23-sjg@chromium.org> From: Ramon Fried Date: Tue, 27 Jul 2021 07:25:28 +0300 Message-ID: Subject: Re: [PATCH 22/33] net: Drop DM_PCI check from designware driver To: Simon Glass Cc: U-Boot Mailing List , Tom Rini , Joe Hershberger Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On Mon, Jul 26, 2021 at 4:38 PM Simon Glass wrote: > > We don't need this check anymore since when PCI is enabled, driver model > is always used. > > Drop it. > > Signed-off-by: Simon Glass > --- > > drivers/net/designware.c | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/designware.c b/drivers/net/designware.c > index 5d92257e74d..5aaac603a0e 100644 > --- a/drivers/net/designware.c > +++ b/drivers/net/designware.c > @@ -756,16 +756,16 @@ int designware_eth_write_hwaddr(struct udevice *dev) > > static int designware_eth_bind(struct udevice *dev) > { > -#ifdef CONFIG_DM_PCI > - static int num_cards; > - char name[20]; > - > - /* Create a unique device name for PCI type devices */ > - if (device_is_on_pci_bus(dev)) { > - sprintf(name, "eth_designware#%u", num_cards++); > - device_set_name(dev, name); > + if (IS_ENABLED(CONFIG_PCI)) { > + static int num_cards; > + char name[20]; > + > + /* Create a unique device name for PCI type devices */ > + if (device_is_on_pci_bus(dev)) { > + sprintf(name, "eth_designware#%u", num_cards++); > + device_set_name(dev, name); > + } > } > -#endif > > return 0; > } > @@ -831,12 +831,11 @@ int designware_eth_probe(struct udevice *dev) > else > reset_deassert_bulk(&reset_bulk); > > -#ifdef CONFIG_DM_PCI > /* > * If we are on PCI bus, either directly attached to a PCI root port, > * or via a PCI bridge, fill in plat before we probe the hardware. > */ > - if (device_is_on_pci_bus(dev)) { > + if (IS_ENABLED(CONFIG_PCI) && device_is_on_pci_bus(dev)) { > dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0, &iobase); > iobase &= PCI_BASE_ADDRESS_MEM_MASK; > iobase = dm_pci_mem_to_phys(dev, iobase); > @@ -844,7 +843,6 @@ int designware_eth_probe(struct udevice *dev) > pdata->iobase = iobase; > pdata->phy_interface = PHY_INTERFACE_MODE_RMII; > } > -#endif > > debug("%s, iobase=%x, priv=%p\n", __func__, iobase, priv); > ioaddr = iobase; > -- > 2.32.0.432.gabb21c7263-goog > Reviewed-by: Ramon Fried