| Message ID | 20240219-stmmac-axi-config-v3-3-fca7f046e6ee@nvidia.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: stmmac: Allow driver-specific AXI configuration | expand |
On Mon, Feb 19, 2024 at 05:46:06PM +0100, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > Allow the device to use bursts and increase the maximum number of > outstanding requests to improve performance. Measurements show an > increase in throughput of around 5x on a 1 Gbps link. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > index bab57d1675df..b6bfa48f279d 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > @@ -199,6 +199,12 @@ static void mgbe_uphy_lane_bringup_serdes_down(struct net_device *ndev, void *mg > writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL); > } > > +static const struct stmmac_axi tegra234_mgbe_axi = { > + .axi_wr_osr_lmt = 63, > + .axi_rd_osr_lmt = 63, > + .axi_blen = { 256, }, > +}; > + > static int tegra_mgbe_probe(struct platform_device *pdev) > { > struct plat_stmmacenet_data *plat; > @@ -284,6 +290,9 @@ static int tegra_mgbe_probe(struct platform_device *pdev) > if (err < 0) > goto disable_clks; > > + /* setup default AXI configuration */ > + res.axi = &tegra234_mgbe_axi; > + > plat = devm_stmmac_probe_config_dt(pdev, &res); > if (IS_ERR(plat)) { > err = PTR_ERR(plat); Let's get back to the v2 discussion: On Mon Feb 5, 2024 at 1:44 AM CET, Serge Semin wrote: > The entire series can be converted to just a few lines of change: > plat = devm_stmmac_probe_config_dt(pdev, res.mac); > if (IS_ERR(plat)) { > err = PTR_ERR(plat); > goto disable_clks; > } > + > + if (IS_ERR_OR_NULL(plat->axi)) { > + plat->axi = devm_kzalloc(&pdev->dev, sizeof(*axi), GFP_KERNEL); > + if (!plat->axi) { > + ret = -ENOMEM; > + goto disable_clks; > + } > + } /* else memset plat->axi with zeros if you wish */ > + > + plat->axi->axi_wr_osr_lmt = 63; > + plat->axi->axi_rd_osr_lmt = 63; > + plat->axi->axi_blen[0] = 256; > > plat->has_xgmac = 1; > plat->flags |= STMMAC_FLAG_TSO_EN; > plat->pmt = 1; > > Please don't overcomplicate the already overcomplicated driver with a > functionality which can be reached by the default one. In this case > the easiest way is to let the generic code work and then > override/replace/fix/etc the retrieved values. Thus there won't be > need in adding the redundant functionality and keep the generic > DT-platform code a bit simpler to read. You responded with: On Tue, Feb 13, 2024 at 04:51:34PM +0100, Thierry Reding wrote: > I'm not sure I understand how this is overcomplicating things. The code > is pretty much unchanged, except that the AXI configuration can now have > driver-specified defaults before the DT is parsed. Perhaps I need to add > comments to make that a bit clearer? > > While your version is certainly simpler it has the drawback that it no > longer allows the platform defaults to be overridden in device tree. I > would prefer if the defaults can be derived from the compatible string > but if need be for those defaults to still be overridable from device > tree. Currently available functionality is easier to read and understand: by default the data is retrieved from the DT, if no AXI DT-node found you can allocate/create your own AXI-configs, if there is AXI DT-node you can fix it up in whatever way your wish. Thus the default behavior is straightforward. You on the contrary suggest to add an additional field to the resources structure which would need to be merged in with the data retrieved from DT. It makes the stmmac_axi_setup() method and the entire logic more complex and thus harder to comprehend. The driver is already overwhelmed with flags and private/platform data fixing the code here and there (see plat_stmmacenet_data, it's a madness). So please justify in more details why do you need one more complexity added instead of: 1. overriding the AXI-configs retrieved from DT, 2. updating DT on your platform ? -Serge(y) > > -- > 2.43.2 >
On Mon Feb 19, 2024 at 7:32 PM CET, Serge Semin wrote: > On Mon, Feb 19, 2024 at 05:46:06PM +0100, Thierry Reding wrote: > > From: Thierry Reding <treding@nvidia.com> > > > > Allow the device to use bursts and increase the maximum number of > > outstanding requests to improve performance. Measurements show an > > increase in throughput of around 5x on a 1 Gbps link. > > > > Signed-off-by: Thierry Reding <treding@nvidia.com> > > --- > > drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > > index bab57d1675df..b6bfa48f279d 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > > @@ -199,6 +199,12 @@ static void mgbe_uphy_lane_bringup_serdes_down(struct net_device *ndev, void *mg > > writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL); > > } > > > > +static const struct stmmac_axi tegra234_mgbe_axi = { > > + .axi_wr_osr_lmt = 63, > > + .axi_rd_osr_lmt = 63, > > + .axi_blen = { 256, }, > > +}; > > + > > static int tegra_mgbe_probe(struct platform_device *pdev) > > { > > struct plat_stmmacenet_data *plat; > > @@ -284,6 +290,9 @@ static int tegra_mgbe_probe(struct platform_device *pdev) > > if (err < 0) > > goto disable_clks; > > > > + /* setup default AXI configuration */ > > + res.axi = &tegra234_mgbe_axi; > > + > > plat = devm_stmmac_probe_config_dt(pdev, &res); > > if (IS_ERR(plat)) { > > err = PTR_ERR(plat); > > Let's get back to the v2 discussion: > > On Mon Feb 5, 2024 at 1:44 AM CET, Serge Semin wrote: > > The entire series can be converted to just a few lines of change: > > plat = devm_stmmac_probe_config_dt(pdev, res.mac); > > if (IS_ERR(plat)) { > > err = PTR_ERR(plat); > > goto disable_clks; > > } > > + > > + if (IS_ERR_OR_NULL(plat->axi)) { > > + plat->axi = devm_kzalloc(&pdev->dev, sizeof(*axi), GFP_KERNEL); > > + if (!plat->axi) { > > + ret = -ENOMEM; > > + goto disable_clks; > > + } > > + } /* else memset plat->axi with zeros if you wish */ > > + > > + plat->axi->axi_wr_osr_lmt = 63; > > + plat->axi->axi_rd_osr_lmt = 63; > > + plat->axi->axi_blen[0] = 256; > > > > plat->has_xgmac = 1; > > plat->flags |= STMMAC_FLAG_TSO_EN; > > plat->pmt = 1; > > > > Please don't overcomplicate the already overcomplicated driver with a > > functionality which can be reached by the default one. In this case > > the easiest way is to let the generic code work and then > > override/replace/fix/etc the retrieved values. Thus there won't be > > need in adding the redundant functionality and keep the generic > > DT-platform code a bit simpler to read. > > You responded with: > > On Tue, Feb 13, 2024 at 04:51:34PM +0100, Thierry Reding wrote: > > I'm not sure I understand how this is overcomplicating things. The code > > is pretty much unchanged, except that the AXI configuration can now have > > driver-specified defaults before the DT is parsed. Perhaps I need to add > > comments to make that a bit clearer? > > > > While your version is certainly simpler it has the drawback that it no > > longer allows the platform defaults to be overridden in device tree. I > > would prefer if the defaults can be derived from the compatible string > > but if need be for those defaults to still be overridable from device > > tree. > > Currently available functionality is easier to read and understand: by > default the data is retrieved from the DT, if no AXI DT-node found you > can allocate/create your own AXI-configs, if there is AXI DT-node you > can fix it up in whatever way your wish. Thus the default behavior is > straightforward. You on the contrary suggest to add an additional > field to the resources structure which would need to be merged in with > the data retrieved from DT. It makes the stmmac_axi_setup() method and > the entire logic more complex and thus harder to comprehend. I suppose that's subjective. Being able to let the driver provide defaults that can then be overridden by values from DT doesn't seem like a very exotic (or complicated) feature to me. We do that elsewhere all the time. Do the comments that I added in this version not sufficiently explain what's going on? > The driver is already overwhelmed with flags and private/platform data > fixing the code here and there (see plat_stmmacenet_data, it's a > madness). So please justify in more details why do you need one more > complexity added instead of: > 1. overriding the AXI-configs retrieved from DT, Again, overriding the AXI configs read from DT doesn't keep the current default behaviour of DT being the final authority. That's a policy that should remain intact. This patch (series) is about allowing the driver to override the AXI defaults with something that's sensible based on the compatible string. The current defaults, for example, cause the GBE on Tegra devices to run at around 100 Mbps even on a 1 Gbps link. > 2. updating DT on your platform That's one possibility and was in fact the first variant I used, but it has a few drawbacks. For example, it means that I need to create the AXI node just to make the device functional, but if possible it's better to derive all necessary information from the compatible string. Having this in a separate AXI configuration node is duplicating information that's already implied by the compatible string. Also, on Tegra we have a few instances of this device that are all configured the same way. Since the AXI configuration node is supposed to be a child of the Ethernet controller node, we end up having to duplicate even more information. Thierry
On Tue, Feb 20, 2024 at 03:28:39PM +0100, Thierry Reding wrote: > On Mon Feb 19, 2024 at 7:32 PM CET, Serge Semin wrote: > > On Mon, Feb 19, 2024 at 05:46:06PM +0100, Thierry Reding wrote: > > > From: Thierry Reding <treding@nvidia.com> > > > > > > Allow the device to use bursts and increase the maximum number of > > > outstanding requests to improve performance. Measurements show an > > > increase in throughput of around 5x on a 1 Gbps link. > > > > > > Signed-off-by: Thierry Reding <treding@nvidia.com> > > > --- > > > drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 9 +++++++++ > > > 1 file changed, 9 insertions(+) > > > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > > > index bab57d1675df..b6bfa48f279d 100644 > > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > > > @@ -199,6 +199,12 @@ static void mgbe_uphy_lane_bringup_serdes_down(struct net_device *ndev, void *mg > > > writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL); > > > } > > > > > > +static const struct stmmac_axi tegra234_mgbe_axi = { > > > + .axi_wr_osr_lmt = 63, > > > + .axi_rd_osr_lmt = 63, > > > + .axi_blen = { 256, }, > > > +}; > > > + > > > static int tegra_mgbe_probe(struct platform_device *pdev) > > > { > > > struct plat_stmmacenet_data *plat; > > > @@ -284,6 +290,9 @@ static int tegra_mgbe_probe(struct platform_device *pdev) > > > if (err < 0) > > > goto disable_clks; > > > > > > + /* setup default AXI configuration */ > > > + res.axi = &tegra234_mgbe_axi; > > > + > > > plat = devm_stmmac_probe_config_dt(pdev, &res); > > > if (IS_ERR(plat)) { > > > err = PTR_ERR(plat); > > > > Let's get back to the v2 discussion: > > > > On Mon Feb 5, 2024 at 1:44 AM CET, Serge Semin wrote: > > > The entire series can be converted to just a few lines of change: > > > plat = devm_stmmac_probe_config_dt(pdev, res.mac); > > > if (IS_ERR(plat)) { > > > err = PTR_ERR(plat); > > > goto disable_clks; > > > } > > > + > > > + if (IS_ERR_OR_NULL(plat->axi)) { > > > + plat->axi = devm_kzalloc(&pdev->dev, sizeof(*axi), GFP_KERNEL); > > > + if (!plat->axi) { > > > + ret = -ENOMEM; > > > + goto disable_clks; > > > + } > > > + } /* else memset plat->axi with zeros if you wish */ > > > + > > > + plat->axi->axi_wr_osr_lmt = 63; > > > + plat->axi->axi_rd_osr_lmt = 63; > > > + plat->axi->axi_blen[0] = 256; > > > > > > plat->has_xgmac = 1; > > > plat->flags |= STMMAC_FLAG_TSO_EN; > > > plat->pmt = 1; > > > > > > Please don't overcomplicate the already overcomplicated driver with a > > > functionality which can be reached by the default one. In this case > > > the easiest way is to let the generic code work and then > > > override/replace/fix/etc the retrieved values. Thus there won't be > > > need in adding the redundant functionality and keep the generic > > > DT-platform code a bit simpler to read. > > > > You responded with: > > > > On Tue, Feb 13, 2024 at 04:51:34PM +0100, Thierry Reding wrote: > > > I'm not sure I understand how this is overcomplicating things. The code > > > is pretty much unchanged, except that the AXI configuration can now have > > > driver-specified defaults before the DT is parsed. Perhaps I need to add > > > comments to make that a bit clearer? > > > > > > While your version is certainly simpler it has the drawback that it no > > > longer allows the platform defaults to be overridden in device tree. I > > > would prefer if the defaults can be derived from the compatible string > > > but if need be for those defaults to still be overridable from device > > > tree. > > > > Currently available functionality is easier to read and understand: by > > default the data is retrieved from the DT, if no AXI DT-node found you > > can allocate/create your own AXI-configs, if there is AXI DT-node you > > can fix it up in whatever way your wish. Thus the default behavior is > > straightforward. You on the contrary suggest to add an additional > > field to the resources structure which would need to be merged in with > > the data retrieved from DT. It makes the stmmac_axi_setup() method and > > the entire logic more complex and thus harder to comprehend. > > I suppose that's subjective. Being able to let the driver provide > defaults that can then be overridden by values from DT doesn't seem like > a very exotic (or complicated) feature to me. We do that elsewhere all > the time. Do the comments that I added in this version not sufficiently > explain what's going on? I have perfectly understood what was going on since v1. My concern is the implementation. Here is the way the platform-specific setup currently works. There are two structures: stmmac_resources and plat_stmmacenet_data. The former one contains the generic platform resources like CSRs mapping, IRQs and MAC-address. The later one mainly has the DW MAC-specific settings. Yes, plat_stmmacenet_data has been evolved to an ugly monster with many redundant flags (fixing code and data here and there in the driver) and with some generic platform resources (which should have been added to the stmmac_resources structure in the first place, like clocks and resets). But still it's purpose is more-or-less defined. Both of these structures can be filled in with data either directly by the glue drivers or by calling the ready-to-use DW MAC platform data getters (stmmac_probe_config_dt() and stmmac_get_platform_resources()). Most importantly is that currently these structures have independent init semantics: no common data, no fields used in both contexts. There are tons of problematic places or questionable implementations in the driver, but at least this one is more-or-less defined: coherency is minimal, logic is linear. You suggest to break that logic by introducing a new stmmac_resources field which doesn't represent a generic resource data, but which purpose is to tweak the AXI-settings in the plat_stmmacenet_data structure. The pointer won't be even ever initialized in the stmmac_get_platform_resources() method because it's done in the stmmac_probe_config_dt() function. Based on all of that the change you suggest look more like a fixup of the problem with your particular device/platform. Let's assume you patches are accepted. In sometime an another developer comes with a need to pre-define say MTL Tx/Rx queue configs, then another one with DMA configs, MDIO-bus settings, and so on. Thus the stmmac_resources structure will eventually turn in a set of the tweaks and the plat_stmmacenet_data pre-defines. That's how the plat_stmmacenet_data structure has turned in what it is now. This doesn't look like a right path to take again. > > > The driver is already overwhelmed with flags and private/platform data > > fixing the code here and there (see plat_stmmacenet_data, it's a > > madness). So please justify in more details why do you need one more > > complexity added instead of: > > 1. overriding the AXI-configs retrieved from DT, > > Again, overriding the AXI configs read from DT doesn't keep the current > default behaviour of DT being the final authority. That's a policy that > should remain intact. This patch (series) is about allowing the driver > to override the AXI defaults with something that's sensible based on > the compatible string. The current defaults, for example, cause the GBE > on Tegra devices to run at around 100 Mbps even on a 1 Gbps link. > > > 2. updating DT on your platform > > That's one possibility and was in fact the first variant I used, but it > has a few drawbacks. For example, it means that I need to create the AXI > node just to make the device functional, but if possible it's better to > derive all necessary information from the compatible string. Having this > in a separate AXI configuration node is duplicating information that's > already implied by the compatible string. > > Also, on Tegra we have a few instances of this device that are all > configured the same way. Since the AXI configuration node is supposed to > be a child of the Ethernet controller node, we end up having to > duplicate even more information. None of that sounds like big problems. The default behavior doesn't make your devices not-working. Yes, the performance is poor, but they still work. Regarding the AXI-config DT-nodes it's not a problem at all. A lot of the DW *MAC instances currently have the AXI-config DT-subnodes. It's absolutely fine to have them setting up the same configs. Once again having the pre-defined configs is fine. All I am worried about is the implementation you suggest especially in using the stmmac_resources structure to tweak up the plat_stmmacenet_data data. So the easiest solutions in your case are: 1. Initialize the plat_stmmacenet_data->axi pointer if no AXI DT-subnode was detected by the stmmac_probe_config_dt() method, after the method is called. This will provide almost the same semantics as you suggest. The only difference is that it would work not on the property level but on the node-level one. (Note the implementation suggested by you doesn't provide the AXI-configs pre-definition for the boolean properties. So it doesn't provide a complete AXI-config default pre-definition.) 2. Add the proper AXI-config DT-subnodes to the respective device tree sources. If despite of all my reasoning you still insist on having a pre-defined setting pattern, then we'll need to come up with some better solution. On the top of my mind it might be for example a pre-definition of the entire plat_stmmacenet_data structure instance or using the software nodes. -Serge(y) > > Thierry
On Fri Feb 23, 2024 at 11:24 PM CET, Serge Semin wrote: > On Tue, Feb 20, 2024 at 03:28:39PM +0100, Thierry Reding wrote: > > On Mon Feb 19, 2024 at 7:32 PM CET, Serge Semin wrote: > > > On Mon, Feb 19, 2024 at 05:46:06PM +0100, Thierry Reding wrote: > > > > From: Thierry Reding <treding@nvidia.com> > > > > > > > > Allow the device to use bursts and increase the maximum number of > > > > outstanding requests to improve performance. Measurements show an > > > > increase in throughput of around 5x on a 1 Gbps link. > > > > > > > > Signed-off-by: Thierry Reding <treding@nvidia.com> > > > > --- > > > > drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 9 +++++++++ > > > > 1 file changed, 9 insertions(+) > > > > > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > > > > index bab57d1675df..b6bfa48f279d 100644 > > > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > > > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c > > > > @@ -199,6 +199,12 @@ static void mgbe_uphy_lane_bringup_serdes_down(struct net_device *ndev, void *mg > > > > writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL); > > > > } > > > > > > > > +static const struct stmmac_axi tegra234_mgbe_axi = { > > > > + .axi_wr_osr_lmt = 63, > > > > + .axi_rd_osr_lmt = 63, > > > > + .axi_blen = { 256, }, > > > > +}; > > > > + > > > > static int tegra_mgbe_probe(struct platform_device *pdev) > > > > { > > > > struct plat_stmmacenet_data *plat; > > > > @@ -284,6 +290,9 @@ static int tegra_mgbe_probe(struct platform_device *pdev) > > > > if (err < 0) > > > > goto disable_clks; > > > > > > > > + /* setup default AXI configuration */ > > > > + res.axi = &tegra234_mgbe_axi; > > > > + > > > > plat = devm_stmmac_probe_config_dt(pdev, &res); > > > > if (IS_ERR(plat)) { > > > > err = PTR_ERR(plat); > > > > > > Let's get back to the v2 discussion: > > > > > > On Mon Feb 5, 2024 at 1:44 AM CET, Serge Semin wrote: > > > > The entire series can be converted to just a few lines of change: > > > > plat = devm_stmmac_probe_config_dt(pdev, res.mac); > > > > if (IS_ERR(plat)) { > > > > err = PTR_ERR(plat); > > > > goto disable_clks; > > > > } > > > > + > > > > + if (IS_ERR_OR_NULL(plat->axi)) { > > > > + plat->axi = devm_kzalloc(&pdev->dev, sizeof(*axi), GFP_KERNEL); > > > > + if (!plat->axi) { > > > > + ret = -ENOMEM; > > > > + goto disable_clks; > > > > + } > > > > + } /* else memset plat->axi with zeros if you wish */ > > > > + > > > > + plat->axi->axi_wr_osr_lmt = 63; > > > > + plat->axi->axi_rd_osr_lmt = 63; > > > > + plat->axi->axi_blen[0] = 256; > > > > > > > > plat->has_xgmac = 1; > > > > plat->flags |= STMMAC_FLAG_TSO_EN; > > > > plat->pmt = 1; > > > > > > > > Please don't overcomplicate the already overcomplicated driver with a > > > > functionality which can be reached by the default one. In this case > > > > the easiest way is to let the generic code work and then > > > > override/replace/fix/etc the retrieved values. Thus there won't be > > > > need in adding the redundant functionality and keep the generic > > > > DT-platform code a bit simpler to read. > > > > > > You responded with: > > > > > > On Tue, Feb 13, 2024 at 04:51:34PM +0100, Thierry Reding wrote: > > > > I'm not sure I understand how this is overcomplicating things. The code > > > > is pretty much unchanged, except that the AXI configuration can now have > > > > driver-specified defaults before the DT is parsed. Perhaps I need to add > > > > comments to make that a bit clearer? > > > > > > > > While your version is certainly simpler it has the drawback that it no > > > > longer allows the platform defaults to be overridden in device tree. I > > > > would prefer if the defaults can be derived from the compatible string > > > > but if need be for those defaults to still be overridable from device > > > > tree. > > > > > > Currently available functionality is easier to read and understand: by > > > default the data is retrieved from the DT, if no AXI DT-node found you > > > can allocate/create your own AXI-configs, if there is AXI DT-node you > > > can fix it up in whatever way your wish. Thus the default behavior is > > > straightforward. You on the contrary suggest to add an additional > > > field to the resources structure which would need to be merged in with > > > the data retrieved from DT. It makes the stmmac_axi_setup() method and > > > the entire logic more complex and thus harder to comprehend. > > > > I suppose that's subjective. Being able to let the driver provide > > defaults that can then be overridden by values from DT doesn't seem like > > a very exotic (or complicated) feature to me. We do that elsewhere all > > the time. Do the comments that I added in this version not sufficiently > > explain what's going on? > > I have perfectly understood what was going on since v1. My concern is > the implementation. Here is the way the platform-specific setup > currently works. > > There are two structures: stmmac_resources and plat_stmmacenet_data. > The former one contains the generic platform resources like CSRs > mapping, IRQs and MAC-address. The later one mainly has the DW > MAC-specific settings. Yes, plat_stmmacenet_data has been evolved to > an ugly monster with many redundant flags (fixing code and data here > and there in the driver) and with some generic platform resources > (which should have been added to the stmmac_resources structure in the > first place, like clocks and resets). But still it's purpose is > more-or-less defined. Both of these structures can be filled in with > data either directly by the glue drivers or by calling the > ready-to-use DW MAC platform data getters (stmmac_probe_config_dt() > and stmmac_get_platform_resources()). Most importantly is that > currently these structures have independent init semantics: no common > data, no fields used in both contexts. There are tons of problematic > places or questionable implementations in the driver, but at least > this one is more-or-less defined: coherency is minimal, logic is > linear. > > You suggest to break that logic by introducing a new stmmac_resources > field which doesn't represent a generic resource data, but which > purpose is to tweak the AXI-settings in the plat_stmmacenet_data > structure. The pointer won't be even ever initialized in the > stmmac_get_platform_resources() method because it's done in the > stmmac_probe_config_dt() function. Based on all of that the change you > suggest look more like a fixup of the problem with your particular > device/platform. > > Let's assume you patches are accepted. In sometime an another > developer comes with a need to pre-define say MTL Tx/Rx queue configs, > then another one with DMA configs, MDIO-bus settings, and so on. Thus > the stmmac_resources structure will eventually turn in a set of the > tweaks and the plat_stmmacenet_data pre-defines. That's how the > plat_stmmacenet_data structure has turned in what it is now. This > doesn't look like a right path to take again. > > > > > > The driver is already overwhelmed with flags and private/platform data > > > fixing the code here and there (see plat_stmmacenet_data, it's a > > > madness). So please justify in more details why do you need one more > > > complexity added instead of: > > > 1. overriding the AXI-configs retrieved from DT, > > > > Again, overriding the AXI configs read from DT doesn't keep the current > > default behaviour of DT being the final authority. That's a policy that > > should remain intact. This patch (series) is about allowing the driver > > to override the AXI defaults with something that's sensible based on > > the compatible string. The current defaults, for example, cause the GBE > > on Tegra devices to run at around 100 Mbps even on a 1 Gbps link. > > > > > 2. updating DT on your platform > > > > > That's one possibility and was in fact the first variant I used, but it > > has a few drawbacks. For example, it means that I need to create the AXI > > node just to make the device functional, but if possible it's better to > > derive all necessary information from the compatible string. Having this > > in a separate AXI configuration node is duplicating information that's > > already implied by the compatible string. > > > > Also, on Tegra we have a few instances of this device that are all > > configured the same way. Since the AXI configuration node is supposed to > > be a child of the Ethernet controller node, we end up having to > > duplicate even more information. > > None of that sounds like big problems. The default behavior doesn't > make your devices not-working. Yes, the performance is poor, but they > still work. Regarding the AXI-config DT-nodes it's not a problem at > all. A lot of the DW *MAC instances currently have the AXI-config > DT-subnodes. It's absolutely fine to have them setting up the same > configs. But that's precisely my issue. In my opinion the default behavior for a device should be to be able to run at optimal performance without having to resort to extra quirks. All of the AXI configuration parameters can be derived from the DT compatible string, so it shouldn't be necessary to duplicate that information in an additional AXI configuration node. > Once again having the pre-defined configs is fine. All I am worried > about is the implementation you suggest especially in using the > stmmac_resources structure to tweak up the plat_stmmacenet_data data. > So the easiest solutions in your case are: > 1. Initialize the plat_stmmacenet_data->axi pointer if no AXI > DT-subnode was detected by the stmmac_probe_config_dt() method, after > the method is called. This will provide almost the same semantics as > you suggest. The only difference is that it would work not on the > property level but on the node-level one. (Note the implementation > suggested by you doesn't provide the AXI-configs pre-definition for > the boolean properties. So it doesn't provide a complete AXI-config > default pre-definition.) Quite frankly that would not be useful at all. If there's no way to override defaults individually this becomes very brittle. If somebody wanted to override just a single parameter, they would need to reproduce the entire AXI configuration node, using an exact copy of the defaults for the parameters that they don't want to change. > 2. Add the proper AXI-config DT-subnodes to the respective device tree > sources. > > If despite of all my reasoning you still insist on having a > pre-defined setting pattern, then we'll need to come up with some > better solution. On the top of my mind it might be for example a > pre-definition of the entire plat_stmmacenet_data structure instance > or using the software nodes. That sounds very impractical. We'd need to make sure to deep-copy the pre-definition structure and such, then deal with reference counting of the clocks, resets and whatever else. I'll drop this series and stick with AXI configuration nodes like everyone else. Thierry
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c index bab57d1675df..b6bfa48f279d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c @@ -199,6 +199,12 @@ static void mgbe_uphy_lane_bringup_serdes_down(struct net_device *ndev, void *mg writel(value, mgbe->xpcs + XPCS_WRAP_UPHY_RX_CONTROL); } +static const struct stmmac_axi tegra234_mgbe_axi = { + .axi_wr_osr_lmt = 63, + .axi_rd_osr_lmt = 63, + .axi_blen = { 256, }, +}; + static int tegra_mgbe_probe(struct platform_device *pdev) { struct plat_stmmacenet_data *plat; @@ -284,6 +290,9 @@ static int tegra_mgbe_probe(struct platform_device *pdev) if (err < 0) goto disable_clks; + /* setup default AXI configuration */ + res.axi = &tegra234_mgbe_axi; + plat = devm_stmmac_probe_config_dt(pdev, &res); if (IS_ERR(plat)) { err = PTR_ERR(plat);