Message ID | 20210618134400.2970928-1-olteanv@gmail.com |
---|---|
State | New |
Headers | show |
Series | [net-next] net: dsa: sja1105: allow the TTEthernet configuration in the static config for SJA1110 | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Fri, 18 Jun 2021 16:44:00 +0300 you wrote: > From: Vladimir Oltean <vladimir.oltean@nxp.com> > > Currently sja1105_static_config_check_valid() is coded up to detect > whether TTEthernet is supported based on device ID, and this check was > not updated to cover SJA1110. > > However, it is desirable to have as few checks for the device ID as > possible, so the driver core is more generic. So what we can do is look > at the static config table operations implemented by that specific > switch family (populated by sja1105_static_config_init) whether the > schedule table has a non-zero maximum entry count (meaning that it is > supported) or not. > > [...] Here is the summary with links: - [net-next] net: dsa: sja1105: allow the TTEthernet configuration in the static config for SJA1110 https://git.kernel.org/netdev/net-next/c/1303e7f9b64f You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.c b/drivers/net/dsa/sja1105/sja1105_static_config.c index 1491b72008f3..7a422ef4deb6 100644 --- a/drivers/net/dsa/sja1105/sja1105_static_config.c +++ b/drivers/net/dsa/sja1105/sja1105_static_config.c @@ -1052,8 +1052,7 @@ sja1105_static_config_check_valid(const struct sja1105_static_config *config, (tables[blk_idx].entry_count == tables[blk_idx].ops->max_entry_count) if (tables[BLK_IDX_SCHEDULE].entry_count) { - if (config->device_id != SJA1105T_DEVICE_ID && - config->device_id != SJA1105QS_DEVICE_ID) + if (!tables[BLK_IDX_SCHEDULE].ops->max_entry_count) return SJA1105_TTETHERNET_NOT_SUPPORTED; if (tables[BLK_IDX_SCHEDULE_ENTRY_POINTS].entry_count == 0)