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=-17.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,MENTIONS_GIT_HOSTING,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 4C883C47083 for ; Wed, 2 Jun 2021 14:57:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2ED87613BF for ; Wed, 2 Jun 2021 14:57:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230072AbhFBO7W (ORCPT ); Wed, 2 Jun 2021 10:59:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbhFBO7R (ORCPT ); Wed, 2 Jun 2021 10:59:17 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFE76C06174A for ; Wed, 2 Jun 2021 07:57:33 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id l1so4309439ejb.6 for ; Wed, 02 Jun 2021 07:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Lf77mMwZzAA4JvAlIHs03uX4mAK0TTWK/orwkH8Yuyc=; b=H81AKOySn+Ottj5bkhpjaekE9NZCwTownPWsjolb2wXZlSTq/QCZ+KCfNqnWwuM/yi tQbKYZF5ng9+Gi2REio4h0+ZBE/MHbBjVQfBDBZ8JVpMK+mcxpqmbaV6dgojvlVn0CWh kAMkgqPhpcAPLXIbF+dE91/GkC83kDqRsuRtXyeWfMn2upCIq7DiJVycm0iMblDPwYJu YpKGIqo+3frEpgXCzOkeYhs3e11nGUBoirorjVQJdLQN/pfcOhv4TfzSzN10zDb1UcIP YzOYs11VqA9mTb6LssSiSCH+bNBVNI2BgvUvyGf8E6RisVI07SMs9SGvv3quudwSm/hG aTJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Lf77mMwZzAA4JvAlIHs03uX4mAK0TTWK/orwkH8Yuyc=; b=OdPGQqCQ0ShtyCyLaLhp1QisDnOxdKqGGPg8TpxR9bfcpfJpCiErE8JdaZphJJ/fwI nOqPUgrN+IqLcjSsFFMmx5BO+oftehRZ0sBlNCtz6oZ8Q/M3enj4VzHyzZQPcTQzMezE ixdhVPiUesnViaLu+DGRGsuw45rvO2/2TJAmxf7+h3gKjBkJtH91c0mkeG9QlTFzqS1+ PGjh60aWr4r+huEh7S8wyRNT2HylMqtPPNlPtLoTTMUUnPFw2OUcgSLXxVuk7vUqoznO uV1OgvMTjB2eTnTTf98b4GO6GQHRbVDGLgzOpstdLcWqrH4AZL55oZniLzFj4IFtwK0f KADg== X-Gm-Message-State: AOAM530BJZwgoGHMR/scuFTqs/rScrraJ06Xyi7nRr0NVkXmdNWFvt4w SlGggxarQ9c8O5aMH1IFfxc= X-Google-Smtp-Source: ABdhPJyk1KOWow+hk09b17RVWYkET2yjaoOtprlicoQFWD5831xSkFFH05yKWH/x33HPOlnkU10wFg== X-Received: by 2002:a17:906:5d14:: with SMTP id g20mr12692985ejt.243.1622645852310; Wed, 02 Jun 2021 07:57:32 -0700 (PDT) Received: from skbuf ([188.26.52.84]) by smtp.gmail.com with ESMTPSA id w13sm90166edc.52.2021.06.02.07.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 07:57:31 -0700 (PDT) Date: Wed, 2 Jun 2021 17:57:30 +0300 From: Vladimir Oltean To: Wong Vee Khee Cc: "Russell King (Oracle)" , Jakub Kicinski , "David S. Miller" , netdev@vger.kernel.org, Ong Boon Leong , Michael Sit Wei Hong , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Heiner Kallweit , Florian Fainelli , Andrew Lunn , Vladimir Oltean Subject: Re: [RFC PATCH v2 net-next 9/9] net: pcs: xpcs: convert to phylink_pcs_ops Message-ID: <20210602145730.nxknzruahn7waqq3@skbuf> References: <20210601003325.1631980-1-olteanv@gmail.com> <20210601003325.1631980-10-olteanv@gmail.com> <20210601121032.GV30436@shell.armlinux.org.uk> <20210602134321.ppvusilvmmybodtx@skbuf> <20210602134749.GL30436@shell.armlinux.org.uk> <20210602140233.3zk6mtr7turmza2r@skbuf> <20210602144336.GA30309@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210602144336.GA30309@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Jun 02, 2021 at 10:43:36PM +0800, Wong Vee Khee wrote: > On Wed, Jun 02, 2021 at 05:02:33PM +0300, Vladimir Oltean wrote: > > On Wed, Jun 02, 2021 at 02:47:49PM +0100, Russell King (Oracle) wrote: > > > On Wed, Jun 02, 2021 at 04:43:21PM +0300, Vladimir Oltean wrote: > > > > On Tue, Jun 01, 2021 at 01:10:33PM +0100, Russell King (Oracle) wrote: > > > > > On Tue, Jun 01, 2021 at 03:33:25AM +0300, Vladimir Oltean wrote: > > > > > > static const struct phylink_mac_ops stmmac_phylink_mac_ops = { > > > > > > .validate = stmmac_validate, > > > > > > - .mac_pcs_get_state = stmmac_mac_pcs_get_state, > > > > > > - .mac_config = stmmac_mac_config, > > > > > > > > > > mac_config is still a required function. > > > > > > > > This is correct, thanks. > > > > > > > > VK, would you mind testing again with this extra patch added to the mix? > > > > If it works, I will add it to the series in v3, ordered properly. > > > > > > > > -----------------------------[ cut here]----------------------------- > > > > From a79863027998451c73d5bbfaf1b77cf6097a110c Mon Sep 17 00:00:00 2001 > > > > From: Vladimir Oltean > > > > Date: Wed, 2 Jun 2021 16:35:55 +0300 > > > > Subject: [PATCH] net: phylink: allow the mac_config method to be missing if > > > > pcs_ops are provided > > > > > > > > The pcs_config method from struct phylink_pcs_ops does everything that > > > > the mac_config method from struct phylink_mac_ops used to do in the > > > > legacy approach of driving a MAC PCS. So allow drivers to not implement > > > > the mac_config method if there is nothing to do. Keep the method > > > > required for setups that do not provide pcs_ops. > > > > > > > > Signed-off-by: Vladimir Oltean > > > > --- > > > > drivers/net/phy/phylink.c | 9 +++++++++ > > > > 1 file changed, 9 insertions(+) > > > > > > > > diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c > > > > index 96d8e88b4e46..a8842c6ce3a2 100644 > > > > --- a/drivers/net/phy/phylink.c > > > > +++ b/drivers/net/phy/phylink.c > > > > @@ -415,6 +415,9 @@ static void phylink_resolve_flow(struct phylink_link_state *state) > > > > static void phylink_mac_config(struct phylink *pl, > > > > const struct phylink_link_state *state) > > > > { > > > > + if (!pl->mac_ops->mac_config) > > > > + return; > > > > + > > > > phylink_dbg(pl, > > > > "%s: mode=%s/%s/%s/%s adv=%*pb pause=%02x link=%u an=%u\n", > > > > __func__, phylink_an_mode_str(pl->cur_link_an_mode), > > > > @@ -1192,6 +1195,12 @@ void phylink_start(struct phylink *pl) > > > > > > > > ASSERT_RTNL(); > > > > > > > > + /* The mac_ops::mac_config method may be absent only if the > > > > + * pcs_ops are present. > > > > + */ > > > > + if (WARN_ON_ONCE(!pl->mac_ops->mac_config && !pl->pcs_ops)) > > > > + return; > > > > + > > > > phylink_info(pl, "configuring for %s/%s link mode\n", > > > > phylink_an_mode_str(pl->cur_link_an_mode), > > > > phy_modes(pl->link_config.interface)); > > > > > > I would rather we didn't do that - I suspect your case is not the > > > common scenario, so please add a dummy function to stmmac instead. > > > > Ok, in that case the only delta to be applied should be: > > > > -----------------------------[ cut here]----------------------------- > > >From 998569108392befc591f790e46fe5dcd1d0b6278 Mon Sep 17 00:00:00 2001 > > From: Vladimir Oltean > > Date: Wed, 2 Jun 2021 17:00:12 +0300 > > Subject: [PATCH] fixup! net: pcs: xpcs: convert to phylink_pcs_ops > > > > Signed-off-by: Vladimir Oltean > > --- > > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > index d5685a74f3b7..704aa91b145a 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > @@ -1000,6 +1000,12 @@ static void stmmac_validate(struct phylink_config *config, > > xpcs_validate(priv->hw->xpcs, supported, state); > > } > > > > +static void stmmac_mac_config(struct phylink_config *config, unsigned int mode, > > + const struct phylink_link_state *state) > > +{ > > + /* Nothing to do, xpcs_config() handles everything */ > > +} > > + > > static void stmmac_fpe_link_state_handle(struct stmmac_priv *priv, bool is_up) > > { > > struct stmmac_fpe_cfg *fpe_cfg = priv->plat->fpe_cfg; > > -----------------------------[ cut here]----------------------------- > > No luck.. I am still seeing the same kernel panic on my side with the > additional patch applied: > > [ 12.513652] intel-eth-pci 0000:00:1e.4 enp0s30f4: FPE workqueue start > [ 12.520079] intel-eth-pci 0000:00:1e.4 enp0s30f4: configuring for inband/sgmii link mode > [ 12.528141] BUG: kernel NULL pointer dereference, address: 0000000000000000 > [ 12.535072] #PF: supervisor instruction fetch in kernel mode > [ 12.540719] #PF: error_code(0x0010) - not-present page > [ 12.545843] PGD 0 P4D 0 > [ 12.548382] Oops: 0010 [#1] PREEMPT SMP NOPTI > [ 12.552733] CPU: 3 PID: 2657 Comm: connmand Tainted: G U 5.13.0-rc3-intel-lts #79 > [ 12.561485] Hardware name: Intel Corporation Tiger Lake Client Platform/TigerLake U DDR4 SODIMM RVP, BIOS TGLIFUI1.R00.3373.AF0.2009230546 09/23/2020 > [ 12.574803] RIP: 0010:0x0 > [ 12.577436] Code: Unable to access opcode bytes at RIP 0xffffffffffffffd6. > [ 12.584280] RSP: 0018:ffffaa05404efb78 EFLAGS: 00010246 > [ 12.589489] RAX: 0000000000000000 RBX: ffffa0fb91758c00 RCX: 0000000000000000 > [ 12.596600] RDX: ffffaa05404efba0 RSI: 0000000000000002 RDI: ffffa0facc63c4d8 > [ 12.603711] RBP: ffffaa05404efba0 R08: 0000000000000000 R09: ffffaa05404ef888 > [ 12.610825] R10: 0000000000000001 R11: 0000000000000001 R12: 0000000000000001 > [ 12.617935] R13: ffffa0facc6388c0 R14: 0000000000000006 R15: 0000000000000001 > [ 12.625040] FS: 00007f4a6d5b87c0(0000) GS:ffffa0fc57f80000(0000) knlGS:0000000000000000 > [ 12.633096] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 12.638825] CR2: ffffffffffffffd6 CR3: 000000010e3f6004 CR4: 0000000000770ee0 > [ 12.645932] PKRU: 55555554 > [ 12.648641] Call Trace: > [ 12.651095] phylink_major_config+0x5e/0x1a0 [phylink] > [ 12.656219] phylink_start+0x204/0x2c0 [phylink] > [ 12.660833] stmmac_open+0x3d0/0x9f0 [stmmac] > [ 12.665186] __dev_open+0xe7/0x180 > [ 12.668594] __dev_change_flags+0x174/0x1d0 > [ 12.672773] ? __thaw_task+0x40/0x40 > [ 12.676348] ? arch_stack_walk+0x9e/0xf0 > [ 12.680266] dev_change_flags+0x21/0x60 > [ 12.684100] devinet_ioctl+0x5e8/0x750 > [ 12.687847] inet_ioctl+0x190/0x1c0 > [ 12.691335] ? dev_ioctl+0x26d/0x4c0 > [ 12.694907] sock_do_ioctl+0x44/0x140 > [ 12.698569] ? alloc_empty_file+0x61/0xb0 > [ 12.702572] sock_ioctl+0x22c/0x320 > [ 12.706061] __x64_sys_ioctl+0x80/0xb0 > [ 12.709808] do_syscall_64+0x42/0x80 > [ 12.713381] entry_SYSCALL_64_after_hwframe+0x44/0xae > > My git log:- > dc25bc46886e (HEAD -> master) phy: maxlinear: add Maxlinear GPY115/21x/24x driver > d059f32fcef1 fixup! net: pcs: xpcs: convert to phylink_pcs_ops > 1a1a9c7267c1 net: pcs: xpcs: convert to phylink_pcs_ops > ec25f3c80108 net: pcs: xpcs: convert to mdio_device > 912a23a5768a net: pcs: xpcs: use mdiobus_c45_addr in xpcs_{read,write} > af2bd0a4e32c net: pcs: xpcs: export xpcs_probe > 7e4eea51132f net: pcs: xpcs: export xpcs_config_eee > 37d5e086fc83 net: pcs: xpcs: export xpcs_validate > d58487edb1a8 net: pcs: xpcs: make the checks related to the PHY interface mode stateless > 2f0eba94af8d net: pcs: xpcs: there is only one PHY ID > 67148dd06896 net: pcs: xpcs: delete shim definition for mdio_xpcs_get_ops() > 5fe8e519e44f (origin/master, origin/HEAD) Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next Yikes, stupid me, I forgot to add this piece to the delta, the new callback wasn't doing anything, but it also didn't warn me that the static function is unused in my build: -----------------------------[ cut here]----------------------------- >From 7a2b56091fd480ae1018ac964756368904a41a0c Mon Sep 17 00:00:00 2001 From: Vladimir Oltean Date: Wed, 2 Jun 2021 17:54:58 +0300 Subject: [PATCH] fixup! fixup! net: pcs: xpcs: convert to phylink_pcs_ops Signed-off-by: Vladimir Oltean --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 704aa91b145a..5b5edfdccab3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1137,6 +1137,7 @@ static void stmmac_mac_link_up(struct phylink_config *config, static const struct phylink_mac_ops stmmac_phylink_mac_ops = { .validate = stmmac_validate, + .mac_config = stmmac_mac_config, .mac_link_down = stmmac_mac_link_down, .mac_link_up = stmmac_mac_link_up, }; -----------------------------[ cut here]-----------------------------