* [PATCH v1 0/2] hw/net:ftgmac100: support AST2700 @ 2024-06-19 10:01 Jamin Lin via 2024-06-19 10:01 ` [PATCH v1 1/2] hw/net:ftgmac100: fix coding style Jamin Lin via 2024-06-19 10:01 ` [PATCH v1 2/2] hw/net:ftgmac100: support 64 bits dma dram address for AST2700 Jamin Lin via 0 siblings, 2 replies; 6+ messages in thread From: Jamin Lin via @ 2024-06-19 10:01 UTC (permalink / raw) To: Cédric Le Goater, Peter Maydell, Steven Lee, Troy Lee, Andrew Jeffery, Joel Stanley, Jason Wang, open list:ASPEED BMCs, open list:All patches CC here Cc: jamin_lin, troy_lee, yunlin.tang change from v1: - ftgmac100 - fix coding style - support 64 bits dma dram address for AST2700 Jamin Lin (2): hw/net:ftgmac100: fix coding style hw/net:ftgmac100: support 64 bits dma dram address for AST2700 hw/net/ftgmac100.c | 83 ++++++++++++++++++++++++++------------ include/hw/net/ftgmac100.h | 9 ++--- 2 files changed, 61 insertions(+), 31 deletions(-) -- 2.34.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v1 1/2] hw/net:ftgmac100: fix coding style 2024-06-19 10:01 [PATCH v1 0/2] hw/net:ftgmac100: support AST2700 Jamin Lin via @ 2024-06-19 10:01 ` Jamin Lin via 2024-06-20 7:01 ` Cédric Le Goater 2024-07-02 5:56 ` Cédric Le Goater 2024-06-19 10:01 ` [PATCH v1 2/2] hw/net:ftgmac100: support 64 bits dma dram address for AST2700 Jamin Lin via 1 sibling, 2 replies; 6+ messages in thread From: Jamin Lin via @ 2024-06-19 10:01 UTC (permalink / raw) To: Cédric Le Goater, Peter Maydell, Steven Lee, Troy Lee, Andrew Jeffery, Joel Stanley, Jason Wang, open list:ASPEED BMCs, open list:All patches CC here Cc: jamin_lin, troy_lee, yunlin.tang Fix coding style issues from checkpatch.pl Test command: ./scripts/checkpatch.pl --no-tree -f hw/net/ftgmac100.c Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> --- hw/net/ftgmac100.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 74b6c3d9a7..25e4c0cd5b 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -238,7 +238,8 @@ typedef struct { */ #define FTGMAC100_MAX_FRAME_SIZE 9220 -/* Limits depending on the type of the frame +/* + * Limits depending on the type of the frame * * 9216 for Jumbo frames (+ 4 for VLAN) * 1518 for other frames (+ 4 for VLAN) @@ -533,8 +534,10 @@ static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring, break; } - /* record transmit flags as they are valid only on the first - * segment */ + /* + * record transmit flags as they are valid only on the first + * segment + */ if (bd.des0 & FTGMAC100_TXDES0_FTS) { flags = bd.des1; } @@ -639,7 +642,8 @@ static bool ftgmac100_can_receive(NetClientState *nc) */ static uint32_t ftgmac100_rxpoll(FTGMAC100State *s) { - /* Polling times : + /* + * Polling times : * * Speed TIME_SEL=0 TIME_SEL=1 * -- 2.34.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/2] hw/net:ftgmac100: fix coding style 2024-06-19 10:01 ` [PATCH v1 1/2] hw/net:ftgmac100: fix coding style Jamin Lin via @ 2024-06-20 7:01 ` Cédric Le Goater 2024-07-02 5:56 ` Cédric Le Goater 1 sibling, 0 replies; 6+ messages in thread From: Cédric Le Goater @ 2024-06-20 7:01 UTC (permalink / raw) To: Jamin Lin, Peter Maydell, Steven Lee, Troy Lee, Andrew Jeffery, Joel Stanley, Jason Wang, open list:ASPEED BMCs, open list:All patches CC here Cc: troy_lee, yunlin.tang On 6/19/24 12:01 PM, Jamin Lin wrote: > Fix coding style issues from checkpatch.pl > > Test command: > ./scripts/checkpatch.pl --no-tree -f hw/net/ftgmac100.c > > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/net/ftgmac100.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c > index 74b6c3d9a7..25e4c0cd5b 100644 > --- a/hw/net/ftgmac100.c > +++ b/hw/net/ftgmac100.c > @@ -238,7 +238,8 @@ typedef struct { > */ > #define FTGMAC100_MAX_FRAME_SIZE 9220 > > -/* Limits depending on the type of the frame > +/* > + * Limits depending on the type of the frame > * > * 9216 for Jumbo frames (+ 4 for VLAN) > * 1518 for other frames (+ 4 for VLAN) > @@ -533,8 +534,10 @@ static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring, > break; > } > > - /* record transmit flags as they are valid only on the first > - * segment */ > + /* > + * record transmit flags as they are valid only on the first > + * segment > + */ > if (bd.des0 & FTGMAC100_TXDES0_FTS) { > flags = bd.des1; > } > @@ -639,7 +642,8 @@ static bool ftgmac100_can_receive(NetClientState *nc) > */ > static uint32_t ftgmac100_rxpoll(FTGMAC100State *s) > { > - /* Polling times : > + /* > + * Polling times : > * > * Speed TIME_SEL=0 TIME_SEL=1 > * ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1 1/2] hw/net:ftgmac100: fix coding style 2024-06-19 10:01 ` [PATCH v1 1/2] hw/net:ftgmac100: fix coding style Jamin Lin via 2024-06-20 7:01 ` Cédric Le Goater @ 2024-07-02 5:56 ` Cédric Le Goater 1 sibling, 0 replies; 6+ messages in thread From: Cédric Le Goater @ 2024-07-02 5:56 UTC (permalink / raw) To: Jamin Lin, Peter Maydell, Steven Lee, Troy Lee, Andrew Jeffery, Joel Stanley, Jason Wang, open list:ASPEED BMCs, open list:All patches CC here Cc: troy_lee, yunlin.tang On 6/19/24 12:01 PM, Jamin Lin wrote: > Fix coding style issues from checkpatch.pl > > Test command: > ./scripts/checkpatch.pl --no-tree -f hw/net/ftgmac100.c > > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Applied to aspeed-next. Thanks, C. > --- > hw/net/ftgmac100.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c > index 74b6c3d9a7..25e4c0cd5b 100644 > --- a/hw/net/ftgmac100.c > +++ b/hw/net/ftgmac100.c > @@ -238,7 +238,8 @@ typedef struct { > */ > #define FTGMAC100_MAX_FRAME_SIZE 9220 > > -/* Limits depending on the type of the frame > +/* > + * Limits depending on the type of the frame > * > * 9216 for Jumbo frames (+ 4 for VLAN) > * 1518 for other frames (+ 4 for VLAN) > @@ -533,8 +534,10 @@ static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring, > break; > } > > - /* record transmit flags as they are valid only on the first > - * segment */ > + /* > + * record transmit flags as they are valid only on the first > + * segment > + */ > if (bd.des0 & FTGMAC100_TXDES0_FTS) { > flags = bd.des1; > } > @@ -639,7 +642,8 @@ static bool ftgmac100_can_receive(NetClientState *nc) > */ > static uint32_t ftgmac100_rxpoll(FTGMAC100State *s) > { > - /* Polling times : > + /* > + * Polling times : > * > * Speed TIME_SEL=0 TIME_SEL=1 > * ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v1 2/2] hw/net:ftgmac100: support 64 bits dma dram address for AST2700 2024-06-19 10:01 [PATCH v1 0/2] hw/net:ftgmac100: support AST2700 Jamin Lin via 2024-06-19 10:01 ` [PATCH v1 1/2] hw/net:ftgmac100: fix coding style Jamin Lin via @ 2024-06-19 10:01 ` Jamin Lin via 2024-06-21 14:57 ` Cédric Le Goater 1 sibling, 1 reply; 6+ messages in thread From: Jamin Lin via @ 2024-06-19 10:01 UTC (permalink / raw) To: Cédric Le Goater, Peter Maydell, Steven Lee, Troy Lee, Andrew Jeffery, Joel Stanley, Jason Wang, open list:ASPEED BMCs, open list:All patches CC here Cc: jamin_lin, troy_lee, yunlin.tang ASPEED AST2700 SOC is a 64 bits quad core CPUs (Cortex-a35) And the base address of dram is "0x4 00000000" which is 64bits address. It have "Normal Priority Transmit Ring Base Address Register High(0x17C)", "High Priority Transmit Ring Base Address Register High(0x184)" and "Receive Ring Base Address Register High(0x18C)" to save the high part physical address of descriptor manager. Ex: TX descriptor manager address [34:0] The "Normal Priority Transmit Ring Base Address Register High(0x17C)" bits [2:0] which corresponds the bits [34:32] of the 64 bits address of the TX ring buffer address. The "Normal Priority Transmit Ring Base Address Register(0x20)" bits [31:0] which corresponds the bits [31:0] of the 64 bits address of the TX ring buffer address. Besides, it have "TXDES 2 and 3" and "RXDES 2 and 3" to save the high part physical address of packet buffer. Ex: TX packet buffer address [34:0] The "TXDES 2" bits [18:16] which corresponds the bits [34:32] of the 64 bits address of the TX packet buffer address and "TXDES 3" bits [31:0] which corresponds the bits [31:0] of the 64 bits address of the TX packet buffer address. Update TX/RX ring and descriptor data type to uint64_t and supports TX/RX ring, descriptor and packet buffers 64 bits address for all ASPEED SOCs models. Incrementing the version of vmstate to 2. Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> --- hw/net/ftgmac100.c | 71 ++++++++++++++++++++++++++------------ include/hw/net/ftgmac100.h | 9 +++-- 2 files changed, 53 insertions(+), 27 deletions(-) diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 25e4c0cd5b..add3c0e270 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -56,6 +56,10 @@ #define FTGMAC100_PHYDATA 0x64 #define FTGMAC100_FCR 0x68 +#define FTGMAC100_NPTXR_BADR_HIGH 0x17C +#define FTGMAC100_HPTXR_BADR_HIGH 0x184 +#define FTGMAC100_RXR_BADR_HIGH 0x18C + /* * Interrupt status register & interrupt enable register */ @@ -165,6 +169,8 @@ #define FTGMAC100_TXDES1_TX2FIC (1 << 30) #define FTGMAC100_TXDES1_TXIC (1 << 31) +#define FTGMAC100_TXDES2_TXBUF_BADR_HI(x) (((x) >> 16) & 0x7) + /* * Receive descriptor */ @@ -198,6 +204,8 @@ #define FTGMAC100_RXDES1_UDP_CHKSUM_ERR (1 << 26) #define FTGMAC100_RXDES1_IP_CHKSUM_ERR (1 << 27) +#define FTGMAC100_RXDES2_RXBUF_BADR_HI(x) (((x) >> 16) & 0x7) + /* * Receive and transmit Buffer Descriptor */ @@ -515,12 +523,13 @@ out: return frame_size; } -static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring, - uint32_t tx_descriptor) +static void ftgmac100_do_tx(FTGMAC100State *s, uint64_t tx_ring, + uint64_t tx_descriptor) { int frame_size = 0; uint8_t *ptr = s->frame; - uint32_t addr = tx_descriptor; + uint64_t addr = tx_descriptor; + uint64_t buf_addr = 0; uint32_t flags = 0; while (1) { @@ -559,7 +568,10 @@ static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring, len = sizeof(s->frame) - frame_size; } - if (dma_memory_read(&address_space_memory, bd.des3, + buf_addr = deposit64(buf_addr, 32, 32, + FTGMAC100_TXDES2_TXBUF_BADR_HI(bd.des2)); + buf_addr = deposit64(buf_addr, 0, 32, bd.des3); + if (dma_memory_read(&address_space_memory, buf_addr, ptr, len, MEMTXATTRS_UNSPECIFIED)) { qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to read packet @ 0x%x\n", __func__, bd.des3); @@ -710,7 +722,7 @@ static uint64_t ftgmac100_read(void *opaque, hwaddr addr, unsigned size) { FTGMAC100State *s = FTGMAC100(opaque); - switch (addr & 0xff) { + switch (addr) { case FTGMAC100_ISR: return s->isr; case FTGMAC100_IER: @@ -726,9 +738,9 @@ static uint64_t ftgmac100_read(void *opaque, hwaddr addr, unsigned size) case FTGMAC100_MATH1: return s->math[1]; case FTGMAC100_RXR_BADR: - return s->rx_ring; + return extract64(s->rx_ring, 0, 32); case FTGMAC100_NPTXR_BADR: - return s->tx_ring; + return extract64(s->tx_ring, 0, 32); case FTGMAC100_ITC: return s->itc; case FTGMAC100_DBLAC: @@ -751,10 +763,15 @@ static uint64_t ftgmac100_read(void *opaque, hwaddr addr, unsigned size) /* We might want to support these one day */ case FTGMAC100_HPTXPD: /* High Priority Transmit Poll Demand */ case FTGMAC100_HPTXR_BADR: /* High Priority Transmit Ring Base Address */ + case FTGMAC100_HPTXR_BADR_HIGH: case FTGMAC100_MACSR: /* MAC Status Register (MACSR) */ qemu_log_mask(LOG_UNIMP, "%s: read to unimplemented register 0x%" HWADDR_PRIx "\n", __func__, addr); return 0; + case FTGMAC100_NPTXR_BADR_HIGH: + return extract64(s->tx_ring, 32, 32); + case FTGMAC100_RXR_BADR_HIGH: + return extract64(s->rx_ring, 32, 32); default: qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset 0x%" HWADDR_PRIx "\n", __func__, addr); @@ -767,7 +784,7 @@ static void ftgmac100_write(void *opaque, hwaddr addr, { FTGMAC100State *s = FTGMAC100(opaque); - switch (addr & 0xff) { + switch (addr) { case FTGMAC100_ISR: /* Interrupt status */ s->isr &= ~value; break; @@ -799,9 +816,8 @@ static void ftgmac100_write(void *opaque, hwaddr addr, HWADDR_PRIx "\n", __func__, value); return; } - - s->rx_ring = value; - s->rx_descriptor = s->rx_ring; + s->rx_ring = deposit64(s->rx_ring, 0, 32, value); + s->rx_descriptor = deposit64(s->rx_descriptor, 0, 32, value); break; case FTGMAC100_RBSR: /* DMA buffer size */ @@ -814,8 +830,8 @@ static void ftgmac100_write(void *opaque, hwaddr addr, HWADDR_PRIx "\n", __func__, value); return; } - s->tx_ring = value; - s->tx_descriptor = s->tx_ring; + s->tx_ring = deposit64(s->tx_ring, 0, 32, value); + s->tx_descriptor = deposit64(s->tx_descriptor, 0, 32, value); break; case FTGMAC100_NPTXPD: /* Trigger transmit */ @@ -905,6 +921,14 @@ static void ftgmac100_write(void *opaque, hwaddr addr, qemu_log_mask(LOG_UNIMP, "%s: write to unimplemented register 0x%" HWADDR_PRIx "\n", __func__, addr); break; + case FTGMAC100_NPTXR_BADR_HIGH: /* Transmit buffer address high */ + s->tx_ring = deposit64(s->tx_ring, 32, 32, value); + s->tx_descriptor = deposit64(s->tx_descriptor, 32, 32, value); + break; + case FTGMAC100_RXR_BADR_HIGH: /* Ring buffer address high */ + s->rx_ring = deposit64(s->rx_ring, 32, 32, value); + s->rx_descriptor = deposit64(s->rx_descriptor, 32, 32, value); + break; default: qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset 0x%" HWADDR_PRIx "\n", __func__, addr); @@ -957,9 +981,9 @@ static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf, FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc)); FTGMAC100Desc bd; uint32_t flags = 0; - uint32_t addr; + uint64_t addr; uint32_t crc; - uint32_t buf_addr; + uint64_t buf_addr = 0; uint8_t *crc_ptr; uint32_t buf_len; size_t size = len; @@ -1024,7 +1048,10 @@ static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf, if (size < 4) { buf_len += size - 4; } - buf_addr = bd.des3; + + buf_addr = deposit64(buf_addr, 32, 32, + FTGMAC100_RXDES2_RXBUF_BADR_HI(bd.des2)); + buf_addr = deposit64(buf_addr, 0, 32, bd.des3); if (first && proto == ETH_P_VLAN && buf_len >= 18) { bd.des1 = lduw_be_p(buf + 14) | FTGMAC100_RXDES1_VLANTAG_AVAIL; @@ -1121,18 +1148,14 @@ static void ftgmac100_realize(DeviceState *dev, Error **errp) static const VMStateDescription vmstate_ftgmac100 = { .name = TYPE_FTGMAC100, - .version_id = 1, - .minimum_version_id = 1, + .version_id = 2, + .minimum_version_id = 2, .fields = (const VMStateField[]) { VMSTATE_UINT32(irq_state, FTGMAC100State), VMSTATE_UINT32(isr, FTGMAC100State), VMSTATE_UINT32(ier, FTGMAC100State), VMSTATE_UINT32(rx_enabled, FTGMAC100State), - VMSTATE_UINT32(rx_ring, FTGMAC100State), VMSTATE_UINT32(rbsr, FTGMAC100State), - VMSTATE_UINT32(tx_ring, FTGMAC100State), - VMSTATE_UINT32(rx_descriptor, FTGMAC100State), - VMSTATE_UINT32(tx_descriptor, FTGMAC100State), VMSTATE_UINT32_ARRAY(math, FTGMAC100State, 2), VMSTATE_UINT32(itc, FTGMAC100State), VMSTATE_UINT32(aptcr, FTGMAC100State), @@ -1151,6 +1174,10 @@ static const VMStateDescription vmstate_ftgmac100 = { VMSTATE_UINT32(phy_int_mask, FTGMAC100State), VMSTATE_UINT32(txdes0_edotr, FTGMAC100State), VMSTATE_UINT32(rxdes0_edorr, FTGMAC100State), + VMSTATE_UINT64(rx_ring, FTGMAC100State), + VMSTATE_UINT64(tx_ring, FTGMAC100State), + VMSTATE_UINT64(rx_descriptor, FTGMAC100State), + VMSTATE_UINT64(tx_descriptor, FTGMAC100State), VMSTATE_END_OF_LIST() } }; diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h index 765d1538a4..01e653b1b4 100644 --- a/include/hw/net/ftgmac100.h +++ b/include/hw/net/ftgmac100.h @@ -38,10 +38,6 @@ struct FTGMAC100State { uint32_t isr; uint32_t ier; uint32_t rx_enabled; - uint32_t rx_ring; - uint32_t rx_descriptor; - uint32_t tx_ring; - uint32_t tx_descriptor; uint32_t math[2]; uint32_t rbsr; uint32_t itc; @@ -54,7 +50,10 @@ struct FTGMAC100State { uint32_t phycr; uint32_t phydata; uint32_t fcr; - + uint64_t rx_ring; + uint64_t rx_descriptor; + uint64_t tx_ring; + uint64_t tx_descriptor; uint32_t phy_status; uint32_t phy_control; -- 2.34.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v1 2/2] hw/net:ftgmac100: support 64 bits dma dram address for AST2700 2024-06-19 10:01 ` [PATCH v1 2/2] hw/net:ftgmac100: support 64 bits dma dram address for AST2700 Jamin Lin via @ 2024-06-21 14:57 ` Cédric Le Goater 0 siblings, 0 replies; 6+ messages in thread From: Cédric Le Goater @ 2024-06-21 14:57 UTC (permalink / raw) To: Jamin Lin, Peter Maydell, Steven Lee, Troy Lee, Andrew Jeffery, Joel Stanley, Jason Wang, open list:ASPEED BMCs, open list:All patches CC here Cc: troy_lee, yunlin.tang On 6/19/24 12:01 PM, Jamin Lin wrote: > ASPEED AST2700 SOC is a 64 bits quad core CPUs (Cortex-a35) > And the base address of dram is "0x4 00000000" which > is 64bits address. > > It have "Normal Priority Transmit Ring Base Address Register High(0x17C)", > "High Priority Transmit Ring Base Address Register High(0x184)" and > "Receive Ring Base Address Register High(0x18C)" to save the high part physical > address of descriptor manager. > Ex: TX descriptor manager address [34:0] > The "Normal Priority Transmit Ring Base Address Register High(0x17C)" > bits [2:0] which corresponds the bits [34:32] of the 64 bits address of > the TX ring buffer address. > The "Normal Priority Transmit Ring Base Address Register(0x20)" bits [31:0] > which corresponds the bits [31:0] of the 64 bits address > of the TX ring buffer address. > > Besides, it have "TXDES 2 and 3" and "RXDES 2 and 3" > to save the high part physical address of packet buffer. > Ex: TX packet buffer address [34:0] > The "TXDES 2" bits [18:16] which corresponds the bits [34:32] > of the 64 bits address of the TX packet buffer address > and "TXDES 3" bits [31:0] which corresponds the bits [31:0] > of the 64 bits address of the TX packet buffer address. > > Update TX/RX ring and descriptor data type to uint64_t > and supports TX/RX ring, descriptor and packet buffers > 64 bits address for all ASPEED SOCs models. > > Incrementing the version of vmstate to 2. > > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> This looks OK overall. However it is exposing a new set of registers that were not available on the previous implementation. To expose the new regs, we could introduce either a new object attribute and property or a new class and class attribute. With this attribute, the realize handler could instantiate a new memory region and map it on top of the current one. The new memop handlers would implement the FTGMAC100_*_HIGH regs. We could avoid the extra memory region by testing the new attribute in the existing memop handlers but I think it would be cleaner to have an extra region. Thanks, C. > --- > hw/net/ftgmac100.c | 71 ++++++++++++++++++++++++++------------ > include/hw/net/ftgmac100.h | 9 +++-- > 2 files changed, 53 insertions(+), 27 deletions(-) > > diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c > index 25e4c0cd5b..add3c0e270 100644 > --- a/hw/net/ftgmac100.c > +++ b/hw/net/ftgmac100.c > @@ -56,6 +56,10 @@ > #define FTGMAC100_PHYDATA 0x64 > #define FTGMAC100_FCR 0x68 > > +#define FTGMAC100_NPTXR_BADR_HIGH 0x17C > +#define FTGMAC100_HPTXR_BADR_HIGH 0x184 > +#define FTGMAC100_RXR_BADR_HIGH 0x18C > + > /* > * Interrupt status register & interrupt enable register > */ > @@ -165,6 +169,8 @@ > #define FTGMAC100_TXDES1_TX2FIC (1 << 30) > #define FTGMAC100_TXDES1_TXIC (1 << 31) > > +#define FTGMAC100_TXDES2_TXBUF_BADR_HI(x) (((x) >> 16) & 0x7) > + > /* > * Receive descriptor > */ > @@ -198,6 +204,8 @@ > #define FTGMAC100_RXDES1_UDP_CHKSUM_ERR (1 << 26) > #define FTGMAC100_RXDES1_IP_CHKSUM_ERR (1 << 27) > > +#define FTGMAC100_RXDES2_RXBUF_BADR_HI(x) (((x) >> 16) & 0x7) > + > /* > * Receive and transmit Buffer Descriptor > */ > @@ -515,12 +523,13 @@ out: > return frame_size; > } > > -static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring, > - uint32_t tx_descriptor) > +static void ftgmac100_do_tx(FTGMAC100State *s, uint64_t tx_ring, > + uint64_t tx_descriptor) > { > int frame_size = 0; > uint8_t *ptr = s->frame; > - uint32_t addr = tx_descriptor; > + uint64_t addr = tx_descriptor; > + uint64_t buf_addr = 0; > uint32_t flags = 0; > > while (1) { > @@ -559,7 +568,10 @@ static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t tx_ring, > len = sizeof(s->frame) - frame_size; > } > > - if (dma_memory_read(&address_space_memory, bd.des3, > + buf_addr = deposit64(buf_addr, 32, 32, > + FTGMAC100_TXDES2_TXBUF_BADR_HI(bd.des2)); > + buf_addr = deposit64(buf_addr, 0, 32, bd.des3); > + if (dma_memory_read(&address_space_memory, buf_addr, > ptr, len, MEMTXATTRS_UNSPECIFIED)) { > qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to read packet @ 0x%x\n", > __func__, bd.des3); > @@ -710,7 +722,7 @@ static uint64_t ftgmac100_read(void *opaque, hwaddr addr, unsigned size) > { > FTGMAC100State *s = FTGMAC100(opaque); > > - switch (addr & 0xff) { > + switch (addr) { > case FTGMAC100_ISR: > return s->isr; > case FTGMAC100_IER: > @@ -726,9 +738,9 @@ static uint64_t ftgmac100_read(void *opaque, hwaddr addr, unsigned size) > case FTGMAC100_MATH1: > return s->math[1]; > case FTGMAC100_RXR_BADR: > - return s->rx_ring; > + return extract64(s->rx_ring, 0, 32); > case FTGMAC100_NPTXR_BADR: > - return s->tx_ring; > + return extract64(s->tx_ring, 0, 32); > case FTGMAC100_ITC: > return s->itc; > case FTGMAC100_DBLAC: > @@ -751,10 +763,15 @@ static uint64_t ftgmac100_read(void *opaque, hwaddr addr, unsigned size) > /* We might want to support these one day */ > case FTGMAC100_HPTXPD: /* High Priority Transmit Poll Demand */ > case FTGMAC100_HPTXR_BADR: /* High Priority Transmit Ring Base Address */ > + case FTGMAC100_HPTXR_BADR_HIGH: > case FTGMAC100_MACSR: /* MAC Status Register (MACSR) */ > qemu_log_mask(LOG_UNIMP, "%s: read to unimplemented register 0x%" > HWADDR_PRIx "\n", __func__, addr); > return 0; > + case FTGMAC100_NPTXR_BADR_HIGH: > + return extract64(s->tx_ring, 32, 32); > + case FTGMAC100_RXR_BADR_HIGH: > + return extract64(s->rx_ring, 32, 32); > default: > qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset 0x%" > HWADDR_PRIx "\n", __func__, addr); > @@ -767,7 +784,7 @@ static void ftgmac100_write(void *opaque, hwaddr addr, > { > FTGMAC100State *s = FTGMAC100(opaque); > > - switch (addr & 0xff) { > + switch (addr) { > case FTGMAC100_ISR: /* Interrupt status */ > s->isr &= ~value; > break; > @@ -799,9 +816,8 @@ static void ftgmac100_write(void *opaque, hwaddr addr, > HWADDR_PRIx "\n", __func__, value); > return; > } > - > - s->rx_ring = value; > - s->rx_descriptor = s->rx_ring; > + s->rx_ring = deposit64(s->rx_ring, 0, 32, value); > + s->rx_descriptor = deposit64(s->rx_descriptor, 0, 32, value); > break; > > case FTGMAC100_RBSR: /* DMA buffer size */ > @@ -814,8 +830,8 @@ static void ftgmac100_write(void *opaque, hwaddr addr, > HWADDR_PRIx "\n", __func__, value); > return; > } > - s->tx_ring = value; > - s->tx_descriptor = s->tx_ring; > + s->tx_ring = deposit64(s->tx_ring, 0, 32, value); > + s->tx_descriptor = deposit64(s->tx_descriptor, 0, 32, value); > break; > > case FTGMAC100_NPTXPD: /* Trigger transmit */ > @@ -905,6 +921,14 @@ static void ftgmac100_write(void *opaque, hwaddr addr, > qemu_log_mask(LOG_UNIMP, "%s: write to unimplemented register 0x%" > HWADDR_PRIx "\n", __func__, addr); > break; > + case FTGMAC100_NPTXR_BADR_HIGH: /* Transmit buffer address high */ > + s->tx_ring = deposit64(s->tx_ring, 32, 32, value); > + s->tx_descriptor = deposit64(s->tx_descriptor, 32, 32, value); > + break; > + case FTGMAC100_RXR_BADR_HIGH: /* Ring buffer address high */ > + s->rx_ring = deposit64(s->rx_ring, 32, 32, value); > + s->rx_descriptor = deposit64(s->rx_descriptor, 32, 32, value); > + break; > default: > qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad address at offset 0x%" > HWADDR_PRIx "\n", __func__, addr); > @@ -957,9 +981,9 @@ static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf, > FTGMAC100State *s = FTGMAC100(qemu_get_nic_opaque(nc)); > FTGMAC100Desc bd; > uint32_t flags = 0; > - uint32_t addr; > + uint64_t addr; > uint32_t crc; > - uint32_t buf_addr; > + uint64_t buf_addr = 0; > uint8_t *crc_ptr; > uint32_t buf_len; > size_t size = len; > @@ -1024,7 +1048,10 @@ static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf, > if (size < 4) { > buf_len += size - 4; > } > - buf_addr = bd.des3; > + > + buf_addr = deposit64(buf_addr, 32, 32, > + FTGMAC100_RXDES2_RXBUF_BADR_HI(bd.des2)); > + buf_addr = deposit64(buf_addr, 0, 32, bd.des3); > if (first && proto == ETH_P_VLAN && buf_len >= 18) { > bd.des1 = lduw_be_p(buf + 14) | FTGMAC100_RXDES1_VLANTAG_AVAIL; > > @@ -1121,18 +1148,14 @@ static void ftgmac100_realize(DeviceState *dev, Error **errp) > > static const VMStateDescription vmstate_ftgmac100 = { > .name = TYPE_FTGMAC100, > - .version_id = 1, > - .minimum_version_id = 1, > + .version_id = 2, > + .minimum_version_id = 2, > .fields = (const VMStateField[]) { > VMSTATE_UINT32(irq_state, FTGMAC100State), > VMSTATE_UINT32(isr, FTGMAC100State), > VMSTATE_UINT32(ier, FTGMAC100State), > VMSTATE_UINT32(rx_enabled, FTGMAC100State), > - VMSTATE_UINT32(rx_ring, FTGMAC100State), > VMSTATE_UINT32(rbsr, FTGMAC100State), > - VMSTATE_UINT32(tx_ring, FTGMAC100State), > - VMSTATE_UINT32(rx_descriptor, FTGMAC100State), > - VMSTATE_UINT32(tx_descriptor, FTGMAC100State), > VMSTATE_UINT32_ARRAY(math, FTGMAC100State, 2), > VMSTATE_UINT32(itc, FTGMAC100State), > VMSTATE_UINT32(aptcr, FTGMAC100State), > @@ -1151,6 +1174,10 @@ static const VMStateDescription vmstate_ftgmac100 = { > VMSTATE_UINT32(phy_int_mask, FTGMAC100State), > VMSTATE_UINT32(txdes0_edotr, FTGMAC100State), > VMSTATE_UINT32(rxdes0_edorr, FTGMAC100State), > + VMSTATE_UINT64(rx_ring, FTGMAC100State), > + VMSTATE_UINT64(tx_ring, FTGMAC100State), > + VMSTATE_UINT64(rx_descriptor, FTGMAC100State), > + VMSTATE_UINT64(tx_descriptor, FTGMAC100State), > VMSTATE_END_OF_LIST() > } > }; > diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h > index 765d1538a4..01e653b1b4 100644 > --- a/include/hw/net/ftgmac100.h > +++ b/include/hw/net/ftgmac100.h > @@ -38,10 +38,6 @@ struct FTGMAC100State { > uint32_t isr; > uint32_t ier; > uint32_t rx_enabled; > - uint32_t rx_ring; > - uint32_t rx_descriptor; > - uint32_t tx_ring; > - uint32_t tx_descriptor; > uint32_t math[2]; > uint32_t rbsr; > uint32_t itc; > @@ -54,7 +50,10 @@ struct FTGMAC100State { > uint32_t phycr; > uint32_t phydata; > uint32_t fcr; > - > + uint64_t rx_ring; > + uint64_t rx_descriptor; > + uint64_t tx_ring; > + uint64_t tx_descriptor; > > uint32_t phy_status; > uint32_t phy_control; ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-02 5:56 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-06-19 10:01 [PATCH v1 0/2] hw/net:ftgmac100: support AST2700 Jamin Lin via 2024-06-19 10:01 ` [PATCH v1 1/2] hw/net:ftgmac100: fix coding style Jamin Lin via 2024-06-20 7:01 ` Cédric Le Goater 2024-07-02 5:56 ` Cédric Le Goater 2024-06-19 10:01 ` [PATCH v1 2/2] hw/net:ftgmac100: support 64 bits dma dram address for AST2700 Jamin Lin via 2024-06-21 14:57 ` Cédric Le Goater
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).