[PATCH qemu 35/38] net/ftgmac100: add a 'aspeed' property

[Cédric Le Goater]

Aspeed SOCs have different definitions for the end of ring bits. Add a
property to specify which set of bits should be used by the nic device
model.

Signed-off-by: Cédric Le Goater <clg at kaod.org>
---
 hw/net/ftgmac100.c         | 24 ++++++++++++++++++++----
 include/hw/net/ftgmac100.h |  2 ++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
index 22573ff956fd..0a8ab6b9e4d8 100644
--- a/hw/net/ftgmac100.c
+++ b/hw/net/ftgmac100.c
@@ -136,9 +136,11 @@ struct ftgmac100_txdes {
 
 #define FTGMAC100_TXDES0_TXBUF_SIZE(x)   ((x) & 0x3fff)
 #define FTGMAC100_TXDES0_EDOTR           (1 << 15)
+
 #define FTGMAC100_TXDES0_CRC_ERR         (1 << 19)
 #define FTGMAC100_TXDES0_LTS             (1 << 28)
 #define FTGMAC100_TXDES0_FTS             (1 << 29)
+#define FTGMAC100_TXDES0_EDOTR_ASPEED    (1 << 30)
 #define FTGMAC100_TXDES0_TXDMA_OWN       (1 << 31)
 
 #define FTGMAC100_TXDES1_VLANTAG_CI(x)   ((x) & 0xffff)
@@ -174,6 +176,7 @@ struct ftgmac100_rxdes {
 #define FTGMAC100_RXDES0_PAUSE_FRAME     (1 << 25)
 #define FTGMAC100_RXDES0_LRS             (1 << 28)
 #define FTGMAC100_RXDES0_FRS             (1 << 29)
+#define FTGMAC100_RXDES0_EDORR_ASPEED    (1 << 30)
 #define FTGMAC100_RXDES0_RXPKT_RDY       (1 << 31)
 
 #define FTGMAC100_RXDES1_VLANTAG_CI      0xffff
@@ -208,6 +211,18 @@ typedef struct {
     uint32_t        des3;        /* TXBUF_BADR */
 } Ftgmac100Desc  __attribute__ ((aligned(16)));
 
+static inline uint32_t ftgmac100_rxdes0_edorr(Ftgmac100State *s)
+{
+    return s->aspeed ?
+        FTGMAC100_RXDES0_EDORR_ASPEED : FTGMAC100_RXDES0_EDORR;
+}
+
+static inline uint32_t ftgmac100_txdes0_edotr(Ftgmac100State *s)
+{
+    return s->aspeed ?
+        FTGMAC100_TXDES0_EDOTR_ASPEED : FTGMAC100_TXDES0_EDOTR;
+}
+
 /* max frame size is :
  *
  *   9216 for Jumbo frames (+ 4 for VLAN)
@@ -405,7 +420,7 @@ static uint32_t ftgmac100_find_txdes(Ftgmac100State *s, uint32_t addr)
 
     while (1) {
         ftgmac100_read_bd(&bd, addr);
-        if (bd.des0 & (FTGMAC100_TXDES0_FTS | FTGMAC100_TXDES0_EDOTR)) {
+        if (bd.des0 & (FTGMAC100_TXDES0_FTS | ftgmac100_txdes0_edotr(s))) {
             break;
         }
         addr += sizeof(Ftgmac100Desc);
@@ -459,7 +474,7 @@ static void ftgmac100_do_tx(Ftgmac100State *s)
         /* Write back the modified descriptor.  */
         ftgmac100_write_bd(&bd, addr);
         /* Advance to the next descriptor.  */
-        if (bd.des0 & FTGMAC100_TXDES0_EDOTR) {
+        if (bd.des0 & ftgmac100_txdes0_edotr(s)) {
             addr = s->tx_ring;
         } else {
             addr += sizeof(Ftgmac100Desc);
@@ -480,7 +495,7 @@ static void ftgmac100_enable_rx(Ftgmac100State *s)
     while (1) {
         ftgmac100_read_bd(&bd, s->rx_descriptor);
         full = (bd.des0 & FTGMAC100_RXDES0_RXPKT_RDY);
-        if (!full || bd.des0 & FTGMAC100_TXDES0_EDOTR) {
+        if (!full || bd.des0 & ftgmac100_txdes0_edotr(s)) {
             break;
         }
         s->rx_descriptor += sizeof(Ftgmac100Desc);
@@ -784,7 +799,7 @@ static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf,
             s->isr |= FTGMAC100_INT_RPKT_FIFO;
         }
         ftgmac100_write_bd(&bd, addr);
-        if (bd.des0 & FTGMAC100_RXDES0_EDORR) {
+        if (bd.des0 & ftgmac100_rxdes0_edorr(s)) {
             addr = s->rx_ring;
         } else {
             addr += sizeof(Ftgmac100Desc);
@@ -869,6 +884,7 @@ static const VMStateDescription vmstate_ftgmac100 = {
 };
 
 static Property ftgmac100_properties[] = {
+    DEFINE_PROP_BOOL("aspeed", Ftgmac100State, aspeed, false),
     DEFINE_NIC_PROPERTIES(Ftgmac100State, conf),
     DEFINE_PROP_END_OF_LIST(),
 };
diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h
index cc5cb4207a5c..ee8975000260 100644
--- a/include/hw/net/ftgmac100.h
+++ b/include/hw/net/ftgmac100.h
@@ -57,6 +57,8 @@ typedef struct Ftgmac100State {
     uint32_t phy_int;
     uint32_t phy_int_mask;
 
+    bool aspeed;
+
 } Ftgmac100State;
 
 #endif
-- 
2.7.4