Message ID | a0d9c14a38201af8f4838e2c84cadec573d56e13.1491349058.git.alistair.francis@xilinx.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 04/04/2017 08:40 PM, Alistair Francis wrote: > Read the correct descriptor instead of hardcoding the first (q=0). > > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > > hw/net/cadence_gem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c > index d4de8ad..17c229d 100644 > --- a/hw/net/cadence_gem.c > +++ b/hw/net/cadence_gem.c > @@ -790,8 +790,8 @@ static void gem_get_rx_desc(CadenceGEMState *s, int q) > { > DB_PRINT("read descriptor 0x%x\n", (unsigned)s->rx_desc_addr[q]); > /* read current descriptor */ > - cpu_physical_memory_read(s->rx_desc_addr[0], > - (uint8_t *)s->rx_desc[0], sizeof(s->rx_desc[0])); > + cpu_physical_memory_read(s->rx_desc_addr[q], > + (uint8_t *)s->rx_desc[q], sizeof(s->rx_desc[q])); > > /* Descriptor owned by software ? */ > if (rx_desc_get_ownership(s->rx_desc[q]) == 1) { >
On 5 April 2017 at 00:40, Alistair Francis <alistair.francis@xilinx.com> wrote: > Read the correct descriptor instead of hardcoding the first (q=0). > > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> > --- > > hw/net/cadence_gem.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c > index d4de8ad..17c229d 100644 > --- a/hw/net/cadence_gem.c > +++ b/hw/net/cadence_gem.c > @@ -790,8 +790,8 @@ static void gem_get_rx_desc(CadenceGEMState *s, int q) > { > DB_PRINT("read descriptor 0x%x\n", (unsigned)s->rx_desc_addr[q]); > /* read current descriptor */ > - cpu_physical_memory_read(s->rx_desc_addr[0], > - (uint8_t *)s->rx_desc[0], sizeof(s->rx_desc[0])); > + cpu_physical_memory_read(s->rx_desc_addr[q], > + (uint8_t *)s->rx_desc[q], sizeof(s->rx_desc[q])); > > /* Descriptor owned by software ? */ > if (rx_desc_get_ownership(s->rx_desc[q]) == 1) { > -- > 2.9.3 > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index d4de8ad..17c229d 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -790,8 +790,8 @@ static void gem_get_rx_desc(CadenceGEMState *s, int q) { DB_PRINT("read descriptor 0x%x\n", (unsigned)s->rx_desc_addr[q]); /* read current descriptor */ - cpu_physical_memory_read(s->rx_desc_addr[0], - (uint8_t *)s->rx_desc[0], sizeof(s->rx_desc[0])); + cpu_physical_memory_read(s->rx_desc_addr[q], + (uint8_t *)s->rx_desc[q], sizeof(s->rx_desc[q])); /* Descriptor owned by software ? */ if (rx_desc_get_ownership(s->rx_desc[q]) == 1) {
Read the correct descriptor instead of hardcoding the first (q=0). Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> --- hw/net/cadence_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)