* [PATCH] net: zynq: Add support for GEM reset
@ 2021-11-18 12:08 Michal Simek
2021-11-21 19:12 ` Ramon Fried
0 siblings, 1 reply; 5+ messages in thread
From: Michal Simek @ 2021-11-18 12:08 UTC (permalink / raw)
To: u-boot, git; +Cc: Joe Hershberger, Ramon Fried
Perform reset before core initialization.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/net/zynq_gem.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 91957757727d..5cbe8d28304b 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -21,6 +21,7 @@
#include <asm/cache.h>
#include <asm/io.h>
#include <phy.h>
+#include <reset.h>
#include <miiphy.h>
#include <wait_bit.h>
#include <watchdog.h>
@@ -217,6 +218,7 @@ struct zynq_gem_priv {
bool int_pcs;
bool dma_64bit;
u32 clk_en_info;
+ struct reset_ctl_bulk resets;
};
static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum,
@@ -688,12 +690,36 @@ static int zynq_gem_miiphy_write(struct mii_dev *bus, int addr, int devad,
return phywrite(priv, addr, reg, value);
}
+static int zynq_gem_reset_init(struct udevice *dev)
+{
+ struct zynq_gem_priv *priv = dev_get_priv(dev);
+ int ret;
+
+ ret = reset_get_bulk(dev, &priv->resets);
+ if (ret == -ENOTSUPP || ret == -ENOENT)
+ return 0;
+ else if (ret)
+ return ret;
+
+ ret = reset_deassert_bulk(&priv->resets);
+ if (ret) {
+ reset_release_bulk(&priv->resets);
+ return ret;
+ }
+
+ return 0;
+}
+
static int zynq_gem_probe(struct udevice *dev)
{
void *bd_space;
struct zynq_gem_priv *priv = dev_get_priv(dev);
int ret;
+ ret = zynq_gem_reset_init(dev);
+ if (ret)
+ return ret;
+
/* Align rxbuffers to ARCH_DMA_MINALIGN */
priv->rxbuffers = memalign(ARCH_DMA_MINALIGN, RX_BUF * PKTSIZE_ALIGN);
if (!priv->rxbuffers)
--
2.33.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] net: zynq: Add support for GEM reset
2021-11-18 12:08 [PATCH] net: zynq: Add support for GEM reset Michal Simek
@ 2021-11-21 19:12 ` Ramon Fried
2021-11-22 7:34 ` Michal Simek
0 siblings, 1 reply; 5+ messages in thread
From: Ramon Fried @ 2021-11-21 19:12 UTC (permalink / raw)
To: Michal Simek; +Cc: U-Boot Mailing List, git, Joe Hershberger
On Thu, Nov 18, 2021 at 2:08 PM Michal Simek <michal.simek@xilinx.com> wrote:
>
> Perform reset before core initialization.
Does it fix any apparent issue ? How did it work before that ?
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
> drivers/net/zynq_gem.c | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
> index 91957757727d..5cbe8d28304b 100644
> --- a/drivers/net/zynq_gem.c
> +++ b/drivers/net/zynq_gem.c
> @@ -21,6 +21,7 @@
> #include <asm/cache.h>
> #include <asm/io.h>
> #include <phy.h>
> +#include <reset.h>
> #include <miiphy.h>
> #include <wait_bit.h>
> #include <watchdog.h>
> @@ -217,6 +218,7 @@ struct zynq_gem_priv {
> bool int_pcs;
> bool dma_64bit;
> u32 clk_en_info;
> + struct reset_ctl_bulk resets;
> };
>
> static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum,
> @@ -688,12 +690,36 @@ static int zynq_gem_miiphy_write(struct mii_dev *bus, int addr, int devad,
> return phywrite(priv, addr, reg, value);
> }
>
> +static int zynq_gem_reset_init(struct udevice *dev)
> +{
> + struct zynq_gem_priv *priv = dev_get_priv(dev);
> + int ret;
> +
> + ret = reset_get_bulk(dev, &priv->resets);
> + if (ret == -ENOTSUPP || ret == -ENOENT)
> + return 0;
> + else if (ret)
> + return ret;
> +
> + ret = reset_deassert_bulk(&priv->resets);
> + if (ret) {
> + reset_release_bulk(&priv->resets);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> static int zynq_gem_probe(struct udevice *dev)
> {
> void *bd_space;
> struct zynq_gem_priv *priv = dev_get_priv(dev);
> int ret;
>
> + ret = zynq_gem_reset_init(dev);
> + if (ret)
> + return ret;
> +
> /* Align rxbuffers to ARCH_DMA_MINALIGN */
> priv->rxbuffers = memalign(ARCH_DMA_MINALIGN, RX_BUF * PKTSIZE_ALIGN);
> if (!priv->rxbuffers)
> --
> 2.33.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: zynq: Add support for GEM reset
2021-11-21 19:12 ` Ramon Fried
@ 2021-11-22 7:34 ` Michal Simek
2021-11-22 10:33 ` Ramon Fried
0 siblings, 1 reply; 5+ messages in thread
From: Michal Simek @ 2021-11-22 7:34 UTC (permalink / raw)
To: Ramon Fried, Michal Simek; +Cc: U-Boot Mailing List, git, Joe Hershberger
On 11/21/21 20:12, Ramon Fried wrote:
> On Thu, Nov 18, 2021 at 2:08 PM Michal Simek <michal.simek@xilinx.com> wrote:
>>
>> Perform reset before core initialization.
> Does it fix any apparent issue ? How did it work before that ?
Standard flow which I would say close to 99% users are using getting all
IPs out of reset that there is no need to reset IP again. This is
because of all low level initialization is done in previous bootloader
stage.
In SOM case which we are working on these IPs are not touched by
previous bootloader stage that's why reset needs to be called before IP
is accessed to make sure that it is in correct state.
Thanks,
Michal
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>> ---
>>
>> drivers/net/zynq_gem.c | 26 ++++++++++++++++++++++++++
>> 1 file changed, 26 insertions(+)
>>
>> diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
>> index 91957757727d..5cbe8d28304b 100644
>> --- a/drivers/net/zynq_gem.c
>> +++ b/drivers/net/zynq_gem.c
>> @@ -21,6 +21,7 @@
>> #include <asm/cache.h>
>> #include <asm/io.h>
>> #include <phy.h>
>> +#include <reset.h>
>> #include <miiphy.h>
>> #include <wait_bit.h>
>> #include <watchdog.h>
>> @@ -217,6 +218,7 @@ struct zynq_gem_priv {
>> bool int_pcs;
>> bool dma_64bit;
>> u32 clk_en_info;
>> + struct reset_ctl_bulk resets;
>> };
>>
>> static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum,
>> @@ -688,12 +690,36 @@ static int zynq_gem_miiphy_write(struct mii_dev *bus, int addr, int devad,
>> return phywrite(priv, addr, reg, value);
>> }
>>
>> +static int zynq_gem_reset_init(struct udevice *dev)
>> +{
>> + struct zynq_gem_priv *priv = dev_get_priv(dev);
>> + int ret;
>> +
>> + ret = reset_get_bulk(dev, &priv->resets);
>> + if (ret == -ENOTSUPP || ret == -ENOENT)
>> + return 0;
>> + else if (ret)
>> + return ret;
>> +
>> + ret = reset_deassert_bulk(&priv->resets);
>> + if (ret) {
>> + reset_release_bulk(&priv->resets);
>> + return ret;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> static int zynq_gem_probe(struct udevice *dev)
>> {
>> void *bd_space;
>> struct zynq_gem_priv *priv = dev_get_priv(dev);
>> int ret;
>>
>> + ret = zynq_gem_reset_init(dev);
>> + if (ret)
>> + return ret;
>> +
>> /* Align rxbuffers to ARCH_DMA_MINALIGN */
>> priv->rxbuffers = memalign(ARCH_DMA_MINALIGN, RX_BUF * PKTSIZE_ALIGN);
>> if (!priv->rxbuffers)
>> --
>> 2.33.1
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: zynq: Add support for GEM reset
2021-11-22 7:34 ` Michal Simek
@ 2021-11-22 10:33 ` Ramon Fried
2021-12-06 15:25 ` Michal Simek
0 siblings, 1 reply; 5+ messages in thread
From: Ramon Fried @ 2021-11-22 10:33 UTC (permalink / raw)
To: Michal Simek; +Cc: U-Boot Mailing List, git, Joe Hershberger
On Mon, Nov 22, 2021 at 9:34 AM Michal Simek <michal.simek@xilinx.com> wrote:
>
>
>
> On 11/21/21 20:12, Ramon Fried wrote:
> > On Thu, Nov 18, 2021 at 2:08 PM Michal Simek <michal.simek@xilinx.com> wrote:
> >>
> >> Perform reset before core initialization.
> > Does it fix any apparent issue ? How did it work before that ?
>
> Standard flow which I would say close to 99% users are using getting all
> IPs out of reset that there is no need to reset IP again. This is
> because of all low level initialization is done in previous bootloader
> stage.
> In SOM case which we are working on these IPs are not touched by
> previous bootloader stage that's why reset needs to be called before IP
> is accessed to make sure that it is in correct state.
>
> Thanks,
> Michal
>
>
> >>
> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> >> ---
> >>
> >> drivers/net/zynq_gem.c | 26 ++++++++++++++++++++++++++
> >> 1 file changed, 26 insertions(+)
> >>
> >> diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
> >> index 91957757727d..5cbe8d28304b 100644
> >> --- a/drivers/net/zynq_gem.c
> >> +++ b/drivers/net/zynq_gem.c
> >> @@ -21,6 +21,7 @@
> >> #include <asm/cache.h>
> >> #include <asm/io.h>
> >> #include <phy.h>
> >> +#include <reset.h>
> >> #include <miiphy.h>
> >> #include <wait_bit.h>
> >> #include <watchdog.h>
> >> @@ -217,6 +218,7 @@ struct zynq_gem_priv {
> >> bool int_pcs;
> >> bool dma_64bit;
> >> u32 clk_en_info;
> >> + struct reset_ctl_bulk resets;
> >> };
> >>
> >> static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum,
> >> @@ -688,12 +690,36 @@ static int zynq_gem_miiphy_write(struct mii_dev *bus, int addr, int devad,
> >> return phywrite(priv, addr, reg, value);
> >> }
> >>
> >> +static int zynq_gem_reset_init(struct udevice *dev)
> >> +{
> >> + struct zynq_gem_priv *priv = dev_get_priv(dev);
> >> + int ret;
> >> +
> >> + ret = reset_get_bulk(dev, &priv->resets);
> >> + if (ret == -ENOTSUPP || ret == -ENOENT)
> >> + return 0;
> >> + else if (ret)
> >> + return ret;
> >> +
> >> + ret = reset_deassert_bulk(&priv->resets);
> >> + if (ret) {
> >> + reset_release_bulk(&priv->resets);
> >> + return ret;
> >> + }
> >> +
> >> + return 0;
> >> +}
> >> +
> >> static int zynq_gem_probe(struct udevice *dev)
> >> {
> >> void *bd_space;
> >> struct zynq_gem_priv *priv = dev_get_priv(dev);
> >> int ret;
> >>
> >> + ret = zynq_gem_reset_init(dev);
> >> + if (ret)
> >> + return ret;
> >> +
> >> /* Align rxbuffers to ARCH_DMA_MINALIGN */
> >> priv->rxbuffers = memalign(ARCH_DMA_MINALIGN, RX_BUF * PKTSIZE_ALIGN);
> >> if (!priv->rxbuffers)
> >> --
> >> 2.33.1
> >>
Can you add the above description to the commit message ?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: zynq: Add support for GEM reset
2021-11-22 10:33 ` Ramon Fried
@ 2021-12-06 15:25 ` Michal Simek
0 siblings, 0 replies; 5+ messages in thread
From: Michal Simek @ 2021-12-06 15:25 UTC (permalink / raw)
To: Ramon Fried, Michal Simek; +Cc: U-Boot Mailing List, git, Joe Hershberger
On 11/22/21 11:33, Ramon Fried wrote:
> On Mon, Nov 22, 2021 at 9:34 AM Michal Simek <michal.simek@xilinx.com> wrote:
>>
>>
>>
>> On 11/21/21 20:12, Ramon Fried wrote:
>>> On Thu, Nov 18, 2021 at 2:08 PM Michal Simek <michal.simek@xilinx.com> wrote:
>>>>
>>>> Perform reset before core initialization.
>>> Does it fix any apparent issue ? How did it work before that ?
>>
>> Standard flow which I would say close to 99% users are using getting all
>> IPs out of reset that there is no need to reset IP again. This is
>> because of all low level initialization is done in previous bootloader
>> stage.
>> In SOM case which we are working on these IPs are not touched by
>> previous bootloader stage that's why reset needs to be called before IP
>> is accessed to make sure that it is in correct state.
>>
>> Thanks,
>> Michal
>>
>>
>>>>
>>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>>>> ---
>>>>
>>>> drivers/net/zynq_gem.c | 26 ++++++++++++++++++++++++++
>>>> 1 file changed, 26 insertions(+)
>>>>
>>>> diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
>>>> index 91957757727d..5cbe8d28304b 100644
>>>> --- a/drivers/net/zynq_gem.c
>>>> +++ b/drivers/net/zynq_gem.c
>>>> @@ -21,6 +21,7 @@
>>>> #include <asm/cache.h>
>>>> #include <asm/io.h>
>>>> #include <phy.h>
>>>> +#include <reset.h>
>>>> #include <miiphy.h>
>>>> #include <wait_bit.h>
>>>> #include <watchdog.h>
>>>> @@ -217,6 +218,7 @@ struct zynq_gem_priv {
>>>> bool int_pcs;
>>>> bool dma_64bit;
>>>> u32 clk_en_info;
>>>> + struct reset_ctl_bulk resets;
>>>> };
>>>>
>>>> static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum,
>>>> @@ -688,12 +690,36 @@ static int zynq_gem_miiphy_write(struct mii_dev *bus, int addr, int devad,
>>>> return phywrite(priv, addr, reg, value);
>>>> }
>>>>
>>>> +static int zynq_gem_reset_init(struct udevice *dev)
>>>> +{
>>>> + struct zynq_gem_priv *priv = dev_get_priv(dev);
>>>> + int ret;
>>>> +
>>>> + ret = reset_get_bulk(dev, &priv->resets);
>>>> + if (ret == -ENOTSUPP || ret == -ENOENT)
>>>> + return 0;
>>>> + else if (ret)
>>>> + return ret;
>>>> +
>>>> + ret = reset_deassert_bulk(&priv->resets);
>>>> + if (ret) {
>>>> + reset_release_bulk(&priv->resets);
>>>> + return ret;
>>>> + }
>>>> +
>>>> + return 0;
>>>> +}
>>>> +
>>>> static int zynq_gem_probe(struct udevice *dev)
>>>> {
>>>> void *bd_space;
>>>> struct zynq_gem_priv *priv = dev_get_priv(dev);
>>>> int ret;
>>>>
>>>> + ret = zynq_gem_reset_init(dev);
>>>> + if (ret)
>>>> + return ret;
>>>> +
>>>> /* Align rxbuffers to ARCH_DMA_MINALIGN */
>>>> priv->rxbuffers = memalign(ARCH_DMA_MINALIGN, RX_BUF * PKTSIZE_ALIGN);
>>>> if (!priv->rxbuffers)
>>>> --
>>>> 2.33.1
>>>>
> Can you add the above description to the commit message ?
>
sure. v2 sent.
M
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-12-06 15:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-18 12:08 [PATCH] net: zynq: Add support for GEM reset Michal Simek
2021-11-21 19:12 ` Ramon Fried
2021-11-22 7:34 ` Michal Simek
2021-11-22 10:33 ` Ramon Fried
2021-12-06 15:25 ` Michal Simek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.