[RFC PATCH 5/7] rtl8139: IOMMU support

Eduard - Gabriel Munteanu
2010-07-14T05:46:37Z

Memory accesses must go through the IOMMU layer.

Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
---
hw/rtl8139.c | 98 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 72e2242..0f78a69 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -48,6 +48,7 @@
*/

#include "hw.h"
+#include "iommu.h"
#include "pci.h"
#include "qemu-timer.h"
#include "net.h"
@@ -416,7 +417,7 @@ typedef struct RTL8139TallyCounters
static void RTL8139TallyCounters_clear(RTL8139TallyCounters* counters);

/* Writes tally counters to specified physical memory address */
-static void RTL8139TallyCounters_physical_memory_write(target_phys_addr_t tc_addr, RTL8139TallyCounters* counters);
+static void RTL8139TallyCounters_physical_memory_write(DeviceState *qdev, target_phys_addr_t tc_addr, RTL8139TallyCounters* counters);

typedef struct RTL8139State {
PCIDevice dev;
@@ -746,6 +747,11 @@ static int rtl8139_cp_transmitter_enabled(RTL8139State *s)

static void rtl8139_write_buffer(RTL8139State *s, const void *buf, int size)
{
+ struct iommu *iommu;
+ DeviceState *dev;
+
+ iommu = iommu_get(&s->dev.qdev, &dev);
+
if (s->RxBufAddr + size > s->RxBufferSize)
{
int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);
@@ -757,15 +763,15 @@ static void rtl8139_write_buffer(RTL8139State *s, const void *buf, int size)

if (size > wrapped)
{
- cpu_physical_memory_write( s->RxBuf + s->RxBufAddr,
- buf, size-wrapped );
+ iommu_write(iommu, dev, s->RxBuf + s->RxBufAddr,
+ buf, size - wrapped);
}

/* reset buffer pointer */
s->RxBufAddr = 0;

- cpu_physical_memory_write( s->RxBuf + s->RxBufAddr,
- buf + (size-wrapped), wrapped );
+ iommu_write(iommu, dev, s->RxBuf + s->RxBufAddr,
+ buf + (size - wrapped), wrapped);

s->RxBufAddr = wrapped;

@@ -774,7 +780,7 @@ static void rtl8139_write_buffer(RTL8139State *s, const void *buf, int size)
}

/* non-wrapping path or overwrapping enabled */
- cpu_physical_memory_write( s->RxBuf + s->RxBufAddr, buf, size );
+ iommu_write(iommu, dev, s->RxBuf + s->RxBufAddr, buf, size);

s->RxBufAddr += size;
}
@@ -822,6 +828,11 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
static const uint8_t broadcast_macaddr[6] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

+ struct iommu *iommu;
+ DeviceState *dev;
+
+ iommu = iommu_get(&s->dev.qdev, &dev);
+
DEBUG_PRINT((">>> RTL8139: received len=%d\n", size));

/* test if board clock is stopped */
@@ -968,13 +979,13 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_

uint32_t val, rxdw0,rxdw1,rxbufLO,rxbufHI;

- cpu_physical_memory_read(cplus_rx_ring_desc, (uint8_t *)&val, 4);
+ iommu_read(iommu, dev, cplus_rx_ring_desc, (uint8_t *) &val, 4);
rxdw0 = le32_to_cpu(val);
- cpu_physical_memory_read(cplus_rx_ring_desc+4, (uint8_t *)&val, 4);
+ iommu_read(iommu, dev, cplus_rx_ring_desc + 4, (uint8_t *) &val, 4);
rxdw1 = le32_to_cpu(val);
- cpu_physical_memory_read(cplus_rx_ring_desc+8, (uint8_t *)&val, 4);
+ iommu_read(iommu, dev, cplus_rx_ring_desc + 8, (uint8_t *) &val, 4);
rxbufLO = le32_to_cpu(val);
- cpu_physical_memory_read(cplus_rx_ring_desc+12, (uint8_t *)&val, 4);
+ iommu_read(iommu, dev, cplus_rx_ring_desc + 12, (uint8_t *) &val, 4);
rxbufHI = le32_to_cpu(val);

DEBUG_PRINT(("RTL8139: +++ C+ mode RX descriptor %d %08x %08x %08x %08x\n",
@@ -1019,7 +1030,7 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
target_phys_addr_t rx_addr = rtl8139_addr64(rxbufLO, rxbufHI);

/* receive/copy to target memory */
- cpu_physical_memory_write( rx_addr, buf, size );
+ iommu_write(iommu, dev, rx_addr, buf, size);

if (s->CpCmd & CPlusRxChkSum)
{
@@ -1032,7 +1043,7 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
#else
val = 0;
#endif
- cpu_physical_memory_write( rx_addr+size, (uint8_t *)&val, 4);
+ iommu_write(iommu, dev, rx_addr + size, (uint8_t *) &val, 4);

/* first segment of received packet flag */
#define CP_RX_STATUS_FS (1<<29)
@@ -1081,9 +1092,9 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_

/* update ring data */
val = cpu_to_le32(rxdw0);
- cpu_physical_memory_write(cplus_rx_ring_desc, (uint8_t *)&val, 4);
+ iommu_write(iommu, dev, cplus_rx_ring_desc, (uint8_t *) &val, 4);
val = cpu_to_le32(rxdw1);
- cpu_physical_memory_write(cplus_rx_ring_desc+4, (uint8_t *)&val, 4);
+ iommu_write(iommu, dev, cplus_rx_ring_desc + 4, (uint8_t *) &val, 4);

/* update tally counter */
++s->tally_counters.RxOk;
@@ -1279,50 +1290,54 @@ static void RTL8139TallyCounters_clear(RTL8139TallyCounters* counters)
counters->TxUndrn = 0;
}

-static void RTL8139TallyCounters_physical_memory_write(target_phys_addr_t tc_addr, RTL8139TallyCounters* tally_counters)
+static void RTL8139TallyCounters_physical_memory_write(DeviceState *qdev, target_phys_addr_t tc_addr, RTL8139TallyCounters* tally_counters)
{
+ struct iommu *iommu;
+ DeviceState *dev;
uint16_t val16;
uint32_t val32;
uint64_t val64;

+ iommu = iommu_get(qdev, &dev);
+
val64 = cpu_to_le64(tally_counters->TxOk);
- cpu_physical_memory_write(tc_addr + 0, (uint8_t *)&val64, 8);
+ iommu_write(iommu, dev, tc_addr + 0, (uint8_t *) &val64, 8);

val64 = cpu_to_le64(tally_counters->RxOk);
- cpu_physical_memory_write(tc_addr + 8, (uint8_t *)&val64, 8);
+ iommu_write(iommu, dev, tc_addr + 8, (uint8_t *) &val64, 8);

val64 = cpu_to_le64(tally_counters->TxERR);
- cpu_physical_memory_write(tc_addr + 16, (uint8_t *)&val64, 8);
+ iommu_write(iommu, dev, tc_addr + 16, (uint8_t *) &val64, 8);

val32 = cpu_to_le32(tally_counters->RxERR);
- cpu_physical_memory_write(tc_addr + 24, (uint8_t *)&val32, 4);
+ iommu_write(iommu, dev, tc_addr + 24, (uint8_t *) &val32, 4);

val16 = cpu_to_le16(tally_counters->MissPkt);
- cpu_physical_memory_write(tc_addr + 28, (uint8_t *)&val16, 2);
+ iommu_write(iommu, dev, tc_addr + 28, (uint8_t *) &val16, 2);

val16 = cpu_to_le16(tally_counters->FAE);
- cpu_physical_memory_write(tc_addr + 30, (uint8_t *)&val16, 2);
+ iommu_write(iommu, dev, tc_addr + 30, (uint8_t *) &val16, 2);

val32 = cpu_to_le32(tally_counters->Tx1Col);
- cpu_physical_memory_write(tc_addr + 32, (uint8_t *)&val32, 4);
+ iommu_write(iommu, dev, tc_addr + 32, (uint8_t *) &val32, 4);

val32 = cpu_to_le32(tally_counters->TxMCol);
- cpu_physical_memory_write(tc_addr + 36, (uint8_t *)&val32, 4);
+ iommu_write(iommu, dev, tc_addr + 36, (uint8_t *) &val32, 4);

val64 = cpu_to_le64(tally_counters->RxOkPhy);
- cpu_physical_memory_write(tc_addr + 40, (uint8_t *)&val64, 8);
+ iommu_write(iommu, dev, tc_addr + 40, (uint8_t *) &val64, 8);

val64 = cpu_to_le64(tally_counters->RxOkBrd);
- cpu_physical_memory_write(tc_addr + 48, (uint8_t *)&val64, 8);
+ iommu_write(iommu, dev, tc_addr + 48, (uint8_t *) &val64, 8);

val32 = cpu_to_le32(tally_counters->RxOkMul);
- cpu_physical_memory_write(tc_addr + 56, (uint8_t *)&val32, 4);
+ iommu_write(iommu, dev, tc_addr + 56, (uint8_t *) &val32, 4);

val16 = cpu_to_le16(tally_counters->TxAbt);
- cpu_physical_memory_write(tc_addr + 60, (uint8_t *)&val16, 2);
+ iommu_write(iommu, dev, tc_addr + 60, (uint8_t *) &val16, 2);

val16 = cpu_to_le16(tally_counters->TxUndrn);
- cpu_physical_memory_write(tc_addr + 62, (uint8_t *)&val16, 2);
+ iommu_write(iommu, dev, tc_addr + 62, (uint8_t *) &val16, 2);
}

/* Loads values of tally counters from VM state file */
@@ -1758,6 +1773,11 @@ static void rtl8139_transfer_frame(RTL8139State *s, const uint8_t *buf, int size

static int rtl8139_transmit_one(RTL8139State *s, int descriptor)
{
+ struct iommu *iommu;
+ DeviceState *dev;
+
+ iommu = iommu_get(&s->dev.qdev, &dev);
+
if (!rtl8139_transmitter_enabled(s))
{
DEBUG_PRINT(("RTL8139: +++ cannot transmit from descriptor %d: transmitter disabled\n",
@@ -1780,7 +1800,7 @@ static int rtl8139_transmit_one(RTL8139State *s, int descriptor)
DEBUG_PRINT(("RTL8139: +++ transmit reading %d bytes from host memory at 0x%08x\n",
txsize, s->TxAddr[descriptor]));

- cpu_physical_memory_read(s->TxAddr[descriptor], txbuffer, txsize);
+ iommu_read(iommu, dev, s->TxAddr[descriptor], txbuffer, txsize);

/* Mark descriptor as transferred */
s->TxStatus[descriptor] |= TxHostOwns;
@@ -1886,6 +1906,11 @@ static uint16_t ip_checksum(void *data, size_t len)

static int rtl8139_cplus_transmit_one(RTL8139State *s)
{
+ struct iommu *iommu;
+ DeviceState *dev;
+
+ iommu = iommu_get(&s->dev.qdev, &dev);
+
if (!rtl8139_transmitter_enabled(s))
{
DEBUG_PRINT(("RTL8139: +++ C+ mode: transmitter disabled\n"));
@@ -1911,14 +1936,14 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)

uint32_t val, txdw0,txdw1,txbufLO,txbufHI;

- cpu_physical_memory_read(cplus_tx_ring_desc, (uint8_t *)&val, 4);
+ iommu_read(iommu, dev, cplus_tx_ring_desc, (uint8_t *) &val, 4);
txdw0 = le32_to_cpu(val);
/* TODO: implement VLAN tagging support, VLAN tag data is read to txdw1 */
- cpu_physical_memory_read(cplus_tx_ring_desc+4, (uint8_t *)&val, 4);
+ iommu_read(iommu, dev, cplus_tx_ring_desc+4, (uint8_t *) &val, 4);
txdw1 = le32_to_cpu(val);
- cpu_physical_memory_read(cplus_tx_ring_desc+8, (uint8_t *)&val, 4);
+ iommu_read(iommu, dev, cplus_tx_ring_desc+8, (uint8_t *) &val, 4);
txbufLO = le32_to_cpu(val);
- cpu_physical_memory_read(cplus_tx_ring_desc+12, (uint8_t *)&val, 4);
+ iommu_read(iommu, dev, cplus_tx_ring_desc+12, (uint8_t *) &val, 4);
txbufHI = le32_to_cpu(val);

DEBUG_PRINT(("RTL8139: +++ C+ mode TX descriptor %d %08x %08x %08x %08x\n",
@@ -2025,7 +2050,8 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
DEBUG_PRINT(("RTL8139: +++ C+ mode transmit reading %d bytes from host memory at %016" PRIx64 " to offset %d\n",
txsize, (uint64_t)tx_addr, s->cplus_txbuffer_offset));

- cpu_physical_memory_read(tx_addr, s->cplus_txbuffer + s->cplus_txbuffer_offset, txsize);
+ iommu_read(iommu, dev, tx_addr,
+ s->cplus_txbuffer + s->cplus_txbuffer_offset, txsize);
s->cplus_txbuffer_offset += txsize;

/* seek to next Rx descriptor */
@@ -2052,7 +2078,7 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)

/* update ring data */
val = cpu_to_le32(txdw0);
- cpu_physical_memory_write(cplus_tx_ring_desc, (uint8_t *)&val, 4);
+ iommu_write(iommu, dev, cplus_tx_ring_desc, (uint8_t *) &val, 4);
/* TODO: implement VLAN tagging support, VLAN tag data is read to txdw1 */
// val = cpu_to_le32(txdw1);
// cpu_physical_memory_write(cplus_tx_ring_desc+4, &val, 4);
@@ -2381,7 +2407,7 @@ static void rtl8139_TxStatus_write(RTL8139State *s, uint32_t txRegOffset, uint32
target_phys_addr_t tc_addr = rtl8139_addr64(s->TxStatus[0] & ~0x3f, s->TxStatus[1]);

/* dump tally counters to specified memory location */
- RTL8139TallyCounters_physical_memory_write( tc_addr, &s->tally_counters);
+ RTL8139TallyCounters_physical_memory_write(&s->dev.qdev, tc_addr, &s->tally_counters);

/* mark dump completed */
s->TxStatus[0] &= ~0x8;
--
1.7.1