| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <521DC044.9090207@st.com>
Date: Wed, 28 Aug 2013 11:17:56 +0200
From: Giuseppe CAVALLARO <peppe.cavallaro@...com>
To: Sonic Zhang <sonic.adi@...il.com>
Cc: netdev@...r.kernel.org, adi-buildroot-devel@...ts.sourceforge.net,
Sonic Zhang <sonic.zhang@...log.com>
Subject: Re: [PATCH v3] driver:net:stmmac: Disable DMA store and forward mode
if platform data force_thresh_dma_mode is set.
hello some comments below
On 8/28/2013 7:40 AM, Sonic Zhang wrote:
> From: Sonic Zhang <sonic.zhang@...log.com>
>
> Some synopsys ip implementation doesn't support DMA store and forward mode,
> such as BF60x. So, set force_thresh_dma_mode to use DMA thresholds only.
> Update document and devicetree as well.
>
> Signed-off-by: Sonic Zhang <sonic.zhang@...log.com>
> ---
> Documentation/devicetree/bindings/net/stmmac.txt | 2 ++
> Documentation/networking/stmmac.txt | 3 +++
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +++-
> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +++
> include/linux/stmmac.h | 1 +
> 5 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt
> index 261c563..56fbcb5 100644
> --- a/Documentation/devicetree/bindings/net/stmmac.txt
> +++ b/Documentation/devicetree/bindings/net/stmmac.txt
> @@ -22,6 +22,8 @@ Required properties:
> - snps,pbl Programmable Burst Length
> - snps,fixed-burst Program the DMA to use the fixed burst mode
> - snps,mixed-burst Program the DMA to use the mixed burst mode
> +- snps,force_thresh_dma_mode Force DMA to use the Shreshold mode other than
^^^^^^^^^ typo
> + the Store and Forward mode.
if we use this approach you should document that the
force_thresh_dma_mode and force_sf_dma_mode will force the mode for both
tx and rx.
I am wondering now what happens if these are passed together from the
platform? is your code covering this scenario?
we could have a unique force_dma_mode that can be:
rx_force_threshold
tx_force_threshold
rx_force_sf
tx_force_sf
( these can be defined in the stmmac.h platform header )
but this an impact on all the platforms that already use the
force_sf_dma_mode as we said
In this case you should fix this and maybe the patch should be for
net-next (add it in the subject next time).
peppe
>
> Optional properties:
> - mac-address: 6 bytes, mac address
> diff --git a/Documentation/networking/stmmac.txt b/Documentation/networking/stmmac.txt
> index 654d2e5..457b8bb 100644
> --- a/Documentation/networking/stmmac.txt
> +++ b/Documentation/networking/stmmac.txt
> @@ -123,6 +123,7 @@ struct plat_stmmacenet_data {
> int bugged_jumbo;
> int pmt;
> int force_sf_dma_mode;
> + int force_thresh_dma_mode;
> int riwt_off;
> void (*fix_mac_speed)(void *priv, unsigned int speed);
> void (*bus_setup)(void __iomem *ioaddr);
> @@ -159,6 +160,8 @@ Where:
> o pmt: core has the embedded power module (optional).
> o force_sf_dma_mode: force DMA to use the Store and Forward mode
> instead of the Threshold.
> + o force_thresh_dma_mode: force DMA to use the Shreshold mode other than
> + the Store and Forward mode.
> o riwt_off: force to disable the RX watchdog feature and switch to NAPI mode.
> o fix_mac_speed: this callback is used for modifying some syscfg registers
> (on ST SoCs) according to the link speed negotiated by the
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index be40691..8d4ccd3 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -1224,7 +1224,9 @@ static void free_dma_desc_resources(struct stmmac_priv *priv)
> */
> static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
> {
> - if (priv->plat->force_sf_dma_mode || priv->plat->tx_coe) {
> + if (priv->plat->force_thresh_dma_mode)
> + priv->hw->dma->dma_mode(priv->ioaddr, tc, tc);
> + else if (priv->plat->force_sf_dma_mode || priv->plat->tx_coe) {
> /*
> * In case of GMAC, SF mode can be enabled
> * to perform the TX COE in HW. This depends on:
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> index da8be6e..865c944 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> @@ -79,6 +79,9 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
> of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
> dma_cfg->fixed_burst = of_property_read_bool(np, "snps,fixed-burst");
> dma_cfg->mixed_burst = of_property_read_bool(np, "snps,mixed-burst");
> + plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode");
> + if (plat->force_thresh_dma_mode)
> + plat->force_sf_dma_mode = 0;
>
> return 0;
> }
> diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
> index 9e495d31..bb5deb0 100644
> --- a/include/linux/stmmac.h
> +++ b/include/linux/stmmac.h
> @@ -108,6 +108,7 @@ struct plat_stmmacenet_data {
> int bugged_jumbo;
> int pmt;
> int force_sf_dma_mode;
> + int force_thresh_dma_mode;
> int riwt_off;
> void (*fix_mac_speed)(void *priv, unsigned int speed);
> void (*bus_setup)(void __iomem *ioaddr);
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists