linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arun Ramadoss <arun.ramadoss@microchip.com>
To: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>
Cc: Russell King <linux@armlinux.org.uk>,
	Woojung Huh <woojung.huh@microchip.com>,
	<UNGLinuxDriver@microchip.com>, Andrew Lunn <andrew@lunn.ch>,
	Vivien Didelot <vivien.didelot@gmail.com>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Vladimir Oltean <olteanv@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Oleksij Rempel <linux@rempel-privat.de>,
	Marek Vasut <marex@denx.de>,
	Michael Grzeschik <m.grzeschik@pengutronix.de>,
	Eric Dumazet <edumazet@google.com>
Subject: [RFC Patch net-next v2 1/9] net: dsa: microchip: ksz8795: update the port_cnt value in ksz_chip_data
Date: Fri, 13 May 2022 15:52:11 +0530	[thread overview]
Message-ID: <20220513102219.30399-2-arun.ramadoss@microchip.com> (raw)
In-Reply-To: <20220513102219.30399-1-arun.ramadoss@microchip.com>

The port_cnt value in the structure is not used in the switch_init.
Instead it uses the fls(chip->cpu_port), this is due to one of port in
the ksz8794 unavailable. The cpu_port for the 8794 is 0x10, fls(0x10) =
5, hence updating it directly in the ksz_chip_data structure in order to
same with all the other switches in ksz8795.c and ksz9477.c files.

Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com>
---
 drivers/net/dsa/microchip/ksz8795.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index f91deea9368e..83bcabf2dc54 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1607,6 +1607,7 @@ static const struct ksz_chip_data ksz8_switch_chips[] = {
 		 * KSZ8794   0,1,2      4
 		 * KSZ8795   0,1,2,3    4
 		 * KSZ8765   0,1,2,3    4
+		 * port_cnt is configured as 5, even though it is 4
 		 */
 		.chip_id = 0x8794,
 		.dev_name = "KSZ8794",
@@ -1614,7 +1615,7 @@ static const struct ksz_chip_data ksz8_switch_chips[] = {
 		.num_alus = 0,
 		.num_statics = 8,
 		.cpu_ports = 0x10,	/* can be configured as cpu port */
-		.port_cnt = 4,		/* total cpu and user ports */
+		.port_cnt = 5,		/* total cpu and user ports */
 		.ksz87xx_eee_link_erratum = true,
 	},
 	{
@@ -1653,7 +1654,7 @@ static int ksz8_switch_init(struct ksz_device *dev)
 			dev->num_vlans = chip->num_vlans;
 			dev->num_alus = chip->num_alus;
 			dev->num_statics = chip->num_statics;
-			dev->port_cnt = fls(chip->cpu_ports);
+			dev->port_cnt = chip->port_cnt;
 			dev->cpu_port = fls(chip->cpu_ports) - 1;
 			dev->phy_port_cnt = dev->port_cnt - 1;
 			dev->cpu_ports = chip->cpu_ports;
-- 
2.33.0


  reply	other threads:[~2022-05-13 10:23 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-13 10:22 [RFC Patch net-next v2 0/9] net: dsa: microchip: refactor the ksz switch init function Arun Ramadoss
2022-05-13 10:22 ` Arun Ramadoss [this message]
2022-05-16 10:40   ` [RFC Patch net-next v2 1/9] net: dsa: microchip: ksz8795: update the port_cnt value in ksz_chip_data Vladimir Oltean
2022-05-17  2:53   ` Florian Fainelli
2022-05-13 10:22 ` [RFC Patch net-next v2 2/9] net: dsa: microchip: move ksz_chip_data to ksz_common Arun Ramadoss
2022-05-16 10:51   ` Vladimir Oltean
2022-05-17  2:55   ` Florian Fainelli
2022-05-13 10:22 ` [RFC Patch net-next v2 3/9] net: dsa: microchip: perform the compatibility check for dev probed Arun Ramadoss
2022-05-16 11:03   ` Vladimir Oltean
2022-05-16 11:08   ` Vladimir Oltean
2022-05-13 10:22 ` [RFC Patch net-next v2 4/9] net: dsa: microchip: move port memory allocation to ksz_common Arun Ramadoss
2022-05-16 11:12   ` Vladimir Oltean
2022-05-13 10:22 ` [RFC Patch net-next v2 5/9] net: dsa: microchip: move struct mib_names to ksz_chip_data Arun Ramadoss
2022-05-16 11:23   ` Vladimir Oltean
2022-05-13 10:22 ` [RFC Patch net-next v2 6/9] net: dsa: microchip: move get_strings to ksz_common Arun Ramadoss
2022-05-16 11:24   ` Vladimir Oltean
2022-05-17  2:56   ` Florian Fainelli
2022-05-13 10:22 ` [RFC Patch net-next v2 7/9] net: dsa: move mib->cnt_ptr reset code to ksz_common.c Arun Ramadoss
2022-05-16 11:25   ` Vladimir Oltean
2022-05-17  2:56   ` Florian Fainelli
2022-05-13 10:22 ` [RFC Patch net-next v2 8/9] net: dsa: microchip: add the phylink get_caps Arun Ramadoss
2022-05-16 11:29   ` Vladimir Oltean
2022-05-17  2:58   ` Florian Fainelli
2022-05-13 10:22 ` [RFC Patch net-next v2 9/9] net: dsa: microchip: remove unused members in ksz_device Arun Ramadoss
2022-05-16 11:30   ` Vladimir Oltean
2022-05-17  2:58   ` Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220513102219.30399-2-arun.ramadoss@microchip.com \
    --to=arun.ramadoss@microchip.com \
    --cc=UNGLinuxDriver@microchip.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=f.fainelli@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=linux@rempel-privat.de \
    --cc=m.grzeschik@pengutronix.de \
    --cc=marex@denx.de \
    --cc=netdev@vger.kernel.org \
    --cc=olteanv@gmail.com \
    --cc=pabeni@redhat.com \
    --cc=vivien.didelot@gmail.com \
    --cc=woojung.huh@microchip.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).