Skip to contentSkip to conversation

sparc32 protect read-only bits in DMA CSR registers

PATCH Applied Artyom Tarasenko 2 participants 4 messages May 22, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sparc32 protect read-only bits in DMA CSR registers

On a real hardware changing read-only bits has no effect Use a mask common for SCSI and Ethernet registers. The crucial bit is DMA_INTR, because setting or clearing it may produce spurious interrupts.

This patch allows booting Solaris 2.3

---
 hw/sparc32_dma.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
hw/sparc32_dma.c +8 -4
index 3ceb851..b521707 100644
@@ -62,6 +62,9 @@
 #define DMA_DRAIN_FIFO 0x40
 #define DMA_RESET 0x80
 
+/* XXX SCSI and ethernet should have different read-only bit masks */
+#define DMA_CSR_RO_MASK 0xfe000007
+
 typedef struct DMAState DMAState;
 
 struct DMAState {
@@ -187,7 +190,7 @@ static void dma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
     switch (saddr) {
     case 0:
         if (val & DMA_INTREN) {
-            if (val & DMA_INTR) {
+            if (s->dmaregs[0] & DMA_INTR) {
                 DPRINTF("Raise IRQ\n");
                 qemu_irq_raise(s->irq);
             }
@@ -204,16 +207,17 @@ static void dma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
             val &= ~DMA_DRAIN_FIFO;
         } else if (val == 0)
             val = DMA_DRAIN_FIFO;
-        val &= 0x0fffffff;
+        val &= ~DMA_CSR_RO_MASK;
         val |= DMA_VER;
+        s->dmaregs[0] = (s->dmaregs[0] & DMA_CSR_RO_MASK) | val;
         break;
     case 1:
         s->dmaregs[0] |= DMA_LOADED;
-        break;
+        /* fall through */
     default:
+        s->dmaregs[saddr] = val;
         break;
     }
-    s->dmaregs[saddr] = val;
 }
 
 static CPUReadMemoryFunc * const dma_mem_read[3] = {
Signature · 1 line
1.6.2.5
Applied
#1 lore raw

Thanks, applied. You forgot SoB-line, I copied it from the previous version.

Quoted 58 lines · Artyom Tarasenko

On a real hardware changing read-only bits has no effect Use a mask common for SCSI and Ethernet registers. The crucial bit is DMA_INTR, because setting or clearing it may produce spurious interrupts.

This patch allows booting Solaris 2.3
---
 hw/sparc32_dma.c |   12 ++++++++----

 1 files changed, 8 insertions(+), 4 deletions(-)
hw/sparc32_dma.c +3 -0
index 3ceb851..b521707 100644
@@ -62,6 +62,9 @@
  #define DMA_DRAIN_FIFO 0x40
  #define DMA_RESET 0x80
 
+/* XXX SCSI and ethernet should have different read-only bit masks */
+#define DMA_CSR_RO_MASK 0xfe000007
+
  typedef struct DMAState DMAState;
 
  struct DMAState {
@@ -187,7 +190,7 @@ static void dma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
     switch (saddr) {

    case 0:
        if (val & DMA_INTREN) {
-            if (val & DMA_INTR) {
+            if (s->dmaregs[0] & DMA_INTR) {
                DPRINTF("Raise IRQ\n");
                qemu_irq_raise(s->irq);
            }

hw/sparc32_dma.c +2 -1
@@ -204,16 +207,17 @@ static void dma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
             val &= ~DMA_DRAIN_FIFO;
         } else if (val == 0)
             val = DMA_DRAIN_FIFO;
-        val &= 0x0fffffff;
+        val &= ~DMA_CSR_RO_MASK;
         val |= DMA_VER;
+        s->dmaregs[0] = (s->dmaregs[0] & DMA_CSR_RO_MASK) | val;
         break;

    case 1:
        s->dmaregs[0] |= DMA_LOADED;
-        break;
+        /* fall through */
    default:
+        s->dmaregs[saddr] = val;
        break;
    }
-    s->dmaregs[saddr] = val;
 }

 static CPUReadMemoryFunc * const dma_mem_read[3] = { --
1.6.2.5

#2 lore raw

2010/5/22 Blue Swirl <[email protected]>:

Quoted 1 line

Thanks, applied. You forgot SoB-line, I copied it from the previous version.

Sorry. Btw, is there a way to tell 'format-patch' to always include it? Can't find it in the git docs. Otherwise I'll define an alias so I won't need to remember about the '-s' switch.

Quoted 61 lines
Quoted 58 lines · Artyom Tarasenko

On a real hardware changing read-only bits has no effect Use a mask common for SCSI and Ethernet registers. The crucial bit is DMA_INTR, because setting or clearing it may produce spurious interrupts.

This patch allows booting Solaris 2.3
---
 hw/sparc32_dma.c |   12 ++++++++----

 1 files changed, 8 insertions(+), 4 deletions(-)
hw/sparc32_dma.c +3 -0
index 3ceb851..b521707 100644
@@ -62,6 +62,9 @@
  #define DMA_DRAIN_FIFO 0x40
  #define DMA_RESET 0x80
 
+/* XXX SCSI and ethernet should have different read-only bit masks */
+#define DMA_CSR_RO_MASK 0xfe000007
+
  typedef struct DMAState DMAState;
 
  struct DMAState {
@@ -187,7 +190,7 @@ static void dma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
     switch (saddr) {

    case 0:
        if (val & DMA_INTREN) {
-            if (val & DMA_INTR) {
+            if (s->dmaregs[0] & DMA_INTR) {
                DPRINTF("Raise IRQ\n");
                qemu_irq_raise(s->irq);
            }

hw/sparc32_dma.c +2 -1
@@ -204,16 +207,17 @@ static void dma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
             val &= ~DMA_DRAIN_FIFO;
         } else if (val == 0)
             val = DMA_DRAIN_FIFO;
-        val &= 0x0fffffff;
+        val &= ~DMA_CSR_RO_MASK;
         val |= DMA_VER;
+        s->dmaregs[0] = (s->dmaregs[0] & DMA_CSR_RO_MASK) | val;
         break;

    case 1:
        s->dmaregs[0] |= DMA_LOADED;
-        break;
+        /* fall through */
    default:
+        s->dmaregs[saddr] = val;
        break;
    }
-    s->dmaregs[saddr] = val;
 }

 static CPUReadMemoryFunc * const dma_mem_read[3] = { --
1.6.2.5

Signature · 4 lines
Regards,
Artyom Tarasenko

solaris/sparc under qemu blog: http://tyom.blogspot.com/
#3 lore raw
Quoted 6 lines · Artyom Tarasenko

2010/5/22 Blue Swirl <[email protected]>:

Quoted 1 line

Thanks, applied. You forgot SoB-line, I copied it from the previous version.

Sorry. Btw, is there a way to tell 'format-patch' to always include it? Can't find it in the git docs. Otherwise I'll define an alias so I won't need to remember about the '-s' switch.

[format]
thread = true
signoff = true

Though format.thread (adds reference headers to the messages, so patches reference the cover letter) does not seem to work with git 1.6.2.4.

Quoted 70 lines
Quoted 55 lines
Quoted 53 lines · Artyom Tarasenko

On a real hardware changing read-only bits has no effect Use a mask common for SCSI and Ethernet registers. The crucial bit is DMA_INTR, because setting or clearing it may produce spurious interrupts.

This patch allows booting Solaris 2.3
---
 hw/sparc32_dma.c |   12 ++++++++----

 1 files changed, 8 insertions(+), 4 deletions(-)
hw/sparc32_dma.c +3 -0
index 3ceb851..b521707 100644
@@ -62,6 +62,9 @@
  #define DMA_DRAIN_FIFO 0x40
  #define DMA_RESET 0x80
 
+/* XXX SCSI and ethernet should have different read-only bit masks */
+#define DMA_CSR_RO_MASK 0xfe000007
+
  typedef struct DMAState DMAState;
 
  struct DMAState {
@@ -187,7 +190,7 @@ static void dma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
     switch (saddr) {

    case 0:
        if (val & DMA_INTREN) {
-            if (val & DMA_INTR) {
+            if (s->dmaregs[0] & DMA_INTR) {
                DPRINTF("Raise IRQ\n");
                qemu_irq_raise(s->irq);
            }

hw/sparc32_dma.c +2 -1
@@ -204,16 +207,17 @@ static void dma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
             val &= ~DMA_DRAIN_FIFO;
         } else if (val == 0)
             val = DMA_DRAIN_FIFO;
-        val &= 0x0fffffff;
+        val &= ~DMA_CSR_RO_MASK;
         val |= DMA_VER;
+        s->dmaregs[0] = (s->dmaregs[0] & DMA_CSR_RO_MASK) | val;
         break;

    case 1:
        s->dmaregs[0] |= DMA_LOADED;
-        break;
+        /* fall through */
    default:
+        s->dmaregs[saddr] = val;
        break;
    }
-    s->dmaregs[saddr] = val;
 }

Quoted 6 lines
Quoted 5 lines

 static CPUReadMemoryFunc * const dma_mem_read[3] = { --
1.6.2.5

--
Regards,
Artyom Tarasenko

solaris/sparc under qemu blog: http://tyom.blogspot.com/