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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 83212C636D4 for ; Fri, 10 Feb 2023 18:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To: Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Aj5NLYn89wFIFl6LVUFKw5kJYz+jFfWeozhTNvkByWw=; b=Pvb4phMXNimkZvDIQliJ+XXD6R Wz+X0Wi1HbI5t9DcY51nOHHqcjVOu9w91Sga8zVg0wdWj/WiIE3s8ngX0wciiGgpwidk9kTnW+T2N A9BeUGXi4ODfAr0XQxihNVP52cmy2KId0HtB3X+oEVhEl/0E9SeyrDOXhEytUSAPsUSYDsID1KahV Ly2rBSw3OTnA/naFGtwWmTlGd5Tebslok6exJX7P2GktwULK21YifLNhlHNCtTzYVKZfdcdf/PcUz t4R3j4QAhGLK7K1Nli0AR041IXka7KMFpjcO+CwLELcr63yFTz74uyiqauhYYmJddPaRJdX8+gmUB JpzyoBJQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQYZh-0070wg-WA; Fri, 10 Feb 2023 18:56:46 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQYZW-0070tX-Kg; Fri, 10 Feb 2023 18:56:35 +0000 Received: by mail-ej1-x629.google.com with SMTP id qb15so16283700ejc.1; Fri, 10 Feb 2023 10:56:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=Aj5NLYn89wFIFl6LVUFKw5kJYz+jFfWeozhTNvkByWw=; b=SVZcMeHDKoxsFFJbvZKcXY+aqNlWVO1dhQsJ87RWqWypw7ZF5Fb9yMzvf9hk9o+Fd/ Z7l+/g40qYjrd0JMbTlC1fc0Uaepzymb5jlwoI1xyMqJwL1QD4wClTEuMxfUUAJrVKKD wsOG+2W8SXzH2Cr8894DR3Ffb9/oWxay77fVCqSjeiy35XJpcAiM3rTeCA7IIo+Kitky rJ+HYHc+Tpx+bxAQqX5D3x9CuqiPQuHoIeLhah09t6nsG6ZtE5F4hyS0G0npzSzuNX// Vaq5CsGuua36lZ30O/inHOm5PA+DRJeX7/7GLe5RWFafaHrlGGQNcuysq7mZScPLozbx Njqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Aj5NLYn89wFIFl6LVUFKw5kJYz+jFfWeozhTNvkByWw=; b=18UyMOT3eA3XZj3QhqhaoAaR7IvFNkh1XHCS2Ven/Pd72wKvVhotsNdAv45RpmL9n7 SkVfFy6IBYk6hAEpww8tJ01WRVdu855J8nquFP0FKJDZZmHWPDo92NFXn5ALVBUzSCEP Oj/FQfJKF70QBeZ3fNW3IMs62w/I0T5pdvxNmyutzQZNlUPkSBm3IM5wwsNTX9AYopI2 MiqND3LeHXmHqOh9N8m+EMHcrg0PBlGm/KM97ezob9gF+0komllqQUwlcqmHsPJ2GtyR BQAuERAwvmX7DDwwDvzh0GZUUtkxvdL2+z1OIikrv7uTLNw4hbDQYZriZEnygVfqRrRM KEWA== X-Gm-Message-State: AO0yUKWAgZzeW9Qjz/nJTEw2CJOBrPMNZPqfuOmAKEMHDSPua7p5EKVw tA6SVTSG7rKFGHEMAXyHTcU= X-Google-Smtp-Source: AK7set+IEGgjGWCYJGmXAqIIlDYLy8RZZkqkt5ZmVwQCxpPqL4EDLvPs7dQeF6dQ6myRL7nSH8xX7w== X-Received: by 2002:a17:906:801:b0:884:37fd:bf4c with SMTP id e1-20020a170906080100b0088437fdbf4cmr17274720ejd.19.1676055392414; Fri, 10 Feb 2023 10:56:32 -0800 (PST) Received: from skbuf ([188.26.185.183]) by smtp.gmail.com with ESMTPSA id s15-20020a170906500f00b0088f94272ce9sm2727241ejj.151.2023.02.10.10.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 10:56:31 -0800 (PST) Date: Fri, 10 Feb 2023 20:56:29 +0200 From: Vladimir Oltean To: arinc9.unal@gmail.com Cc: Sean Wang , Landen Chao , DENG Qingfang , Andrew Lunn , Florian Fainelli , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno , Richard van Schagen , =?utf-8?B?QXLEsW7DpyDDnE5BTA==?= , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, erkin.bozoglu@xeront.com Subject: Re: [PATCH net-next] net: dsa: mt7530: add support for changing DSA master Message-ID: <20230210185629.gfbaibewnc5u3tgs@skbuf> References: <20230210172942.13290-1-richard@routerhints.com> <20230210172942.13290-1-richard@routerhints.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230210172942.13290-1-richard@routerhints.com> <20230210172942.13290-1-richard@routerhints.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230210_105634_699432_D114D4F6 X-CRM114-Status: GOOD ( 22.10 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Fri, Feb 10, 2023 at 08:29:43PM +0300, arinc9.unal@gmail.com wrote: > From: Richard van Schagen > > Add support for changing the master of a port on the MT7530 DSA subdriver. > > [ arinc.unal@arinc9.com: Wrote subject and changelog ] > > Tested-by: Arınç ÜNAL > Signed-off-by: Richard van Schagen > Signed-off-by: Arınç ÜNAL > --- > drivers/net/dsa/mt7530.c | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c > index b5ad4b4fc00c..04bb4986454e 100644 > --- a/drivers/net/dsa/mt7530.c > +++ b/drivers/net/dsa/mt7530.c > @@ -1072,6 +1072,38 @@ mt7530_port_disable(struct dsa_switch *ds, int port) > mutex_unlock(&priv->reg_mutex); > } > > +static int > +mt7530_port_change_master(struct dsa_switch *ds, int port, > + struct net_device *master, > + struct netlink_ext_ack *extack) alignment > +{ > + struct mt7530_priv *priv = ds->priv; > + struct dsa_port *dp = dsa_to_port(ds, port); > + struct dsa_port *cpu_dp = master->dsa_ptr; > + int old_cpu = dp->cpu_dp->index; > + int new_cpu = cpu_dp->index; I believe you need to reject LAG DSA masters. > + > + mutex_lock(&priv->reg_mutex); > + > + /* Move old to new cpu on User port */ > + priv->ports[port].pm &= ~PCR_MATRIX(BIT(old_cpu)); > + priv->ports[port].pm |= PCR_MATRIX(BIT(new_cpu)); > + > + mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, > + priv->ports[port].pm); > + > + /* Move user port from old cpu to new cpu */ > + priv->ports[old_cpu].pm &= ~PCR_MATRIX(BIT(port)); > + priv->ports[new_cpu].pm |= PCR_MATRIX(BIT(port)); > + > + mt7530_write(priv, MT7530_PCR_P(old_cpu), priv->ports[old_cpu].pm); > + mt7530_write(priv, MT7530_PCR_P(new_cpu), priv->ports[new_cpu].pm); - who writes to the "pm" field of CPU ports? - how does this line up with your other patch which said (AFAIU) that the port matrix of CPU ports should be 0 and that should be fine? - read/modify/write (rmw) using PCR_MATRIX_MASK rather than mt7530_write(). That overwrites the other PCR fields. > + > + mutex_unlock(&priv->reg_mutex); > + > + return 0; > +} > + > static int > mt7530_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) > { > @@ -3157,6 +3189,7 @@ static const struct dsa_switch_ops mt7530_switch_ops = { > .set_ageing_time = mt7530_set_ageing_time, > .port_enable = mt7530_port_enable, > .port_disable = mt7530_port_disable, > + .port_change_master = mt7530_port_change_master, > .port_change_mtu = mt7530_port_change_mtu, > .port_max_mtu = mt7530_port_max_mtu, > .port_stp_state_set = mt7530_stp_state_set, > -- > 2.37.2 >