| Message ID | 1538579266-8389-3-git-send-email-edgar.iglesias@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm: Add first models of Xilinx Versal SoC | expand |
On 10/03/2018 08:07 AM, Edgar E. Iglesias wrote: > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > Announce the availability of the various priority queues. > This fixes an issue where guest kernels would miss to > configure secondary queues due to inproper feature bits. > > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/net/cadence_gem.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c > index e560b7a..901c173 100644 > --- a/hw/net/cadence_gem.c > +++ b/hw/net/cadence_gem.c > @@ -1213,6 +1213,7 @@ static void gem_reset(DeviceState *d) > int i; > CadenceGEMState *s = CADENCE_GEM(d); > const uint8_t *a; > + uint32_t queues_mask; > > DB_PRINT("\n"); > > @@ -1229,7 +1230,10 @@ static void gem_reset(DeviceState *d) > s->regs[GEM_DESCONF] = 0x02500111; > s->regs[GEM_DESCONF2] = 0x2ab13fff; > s->regs[GEM_DESCONF5] = 0x002f2045; > - s->regs[GEM_DESCONF6] = 0x00000200; > + s->regs[GEM_DESCONF6] = 0x0; > + > + queues_mask = MAKE_64BIT_MASK(1, s->num_priority_queues - 1); > + s->regs[GEM_DESCONF6] |= queues_mask; > > /* Set MAC address */ > a = &s->conf.macaddr.a[0]; >
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index e560b7a..901c173 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -1213,6 +1213,7 @@ static void gem_reset(DeviceState *d) int i; CadenceGEMState *s = CADENCE_GEM(d); const uint8_t *a; + uint32_t queues_mask; DB_PRINT("\n"); @@ -1229,7 +1230,10 @@ static void gem_reset(DeviceState *d) s->regs[GEM_DESCONF] = 0x02500111; s->regs[GEM_DESCONF2] = 0x2ab13fff; s->regs[GEM_DESCONF5] = 0x002f2045; - s->regs[GEM_DESCONF6] = 0x00000200; + s->regs[GEM_DESCONF6] = 0x0; + + queues_mask = MAKE_64BIT_MASK(1, s->num_priority_queues - 1); + s->regs[GEM_DESCONF6] |= queues_mask; /* Set MAC address */ a = &s->conf.macaddr.a[0];