Skip to contentSkip to conversation

hw/arm/aspeed: Map the UART5 device unconditionally

PATCH In review Philippe Mathieu-Daudé 3 participants 9 messages Sep 5, 2020 – Oct 1, 2020 Arm/Aspeed machine support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/arm/aspeed: Map the UART5 device unconditionally

The UART5 is present on the machine regardless there is a character device connected to it. Map it unconditionally.

---
 hw/arm/aspeed_ast2600.c | 8 +++-----
 hw/arm/aspeed_soc.c     | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)
hw/arm/aspeed_ast2600.c +3 -5
index 9d95e421435..1450bde7cf2 100644
@@ -325,11 +325,9 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
     }
 
     /* UART - attach an 8250 to the IO space as our UART5 */
-    if (serial_hd(0)) {
-        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
-        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
-                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
-    }
+    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
+                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5),
+                   38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
 
     /* I2C */
     object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
hw/arm/aspeed_soc.c +3 -5
index 35be126db6f..7eefd54ac07 100644
@@ -283,11 +283,9 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
     }
 
     /* UART - attach an 8250 to the IO space as our UART5 */
-    if (serial_hd(0)) {
-        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
-        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
-                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
-    }
+    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
+                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5), 38400,
+                   serial_hd(0), DEVICE_LITTLE_ENDIAN);
 
     /* I2C */
     object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Philippe Mathieu-Daudé

The UART5 is present on the machine regardless there is a character device connected to it. Map it unconditionally.

Quoted 44 lines
---
 hw/arm/aspeed_ast2600.c | 8 +++-----
 hw/arm/aspeed_soc.c     | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)
hw/arm/aspeed_ast2600.c +3 -5
index 9d95e421435..1450bde7cf2 100644
@@ -325,11 +325,9 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
     }
 
     /* UART - attach an 8250 to the IO space as our UART5 */
-    if (serial_hd(0)) {
-        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
-        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
-                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
-    }
+    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
+                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5),
+                   38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
 
     /* I2C */
     object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
hw/arm/aspeed_soc.c +3 -5
index 35be126db6f..7eefd54ac07 100644
@@ -283,11 +283,9 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
     }
 
     /* UART - attach an 8250 to the IO space as our UART5 */
-    if (serial_hd(0)) {
-        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
-        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
-                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
-    }
+    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
+                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5), 38400,
+                   serial_hd(0), DEVICE_LITTLE_ENDIAN);
 
     /* I2C */
     object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
#2 lore raw
In reply to Philippe Mathieu-Daudé

ping?

Quoted 48 lines · Philippe Mathieu-Daudé

The UART5 is present on the machine regardless there is a character device connected to it. Map it unconditionally.

---
 hw/arm/aspeed_ast2600.c | 8 +++-----
 hw/arm/aspeed_soc.c     | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)
hw/arm/aspeed_ast2600.c +3 -5
index 9d95e421435..1450bde7cf2 100644
@@ -325,11 +325,9 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
     }
 
     /* UART - attach an 8250 to the IO space as our UART5 */
-    if (serial_hd(0)) {
-        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
-        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
-                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
-    }
+    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
+                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5),
+                   38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
 
     /* I2C */
     object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
hw/arm/aspeed_soc.c +3 -5
index 35be126db6f..7eefd54ac07 100644
@@ -283,11 +283,9 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
     }
 
     /* UART - attach an 8250 to the IO space as our UART5 */
-    if (serial_hd(0)) {
-        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
-        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
-                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
-    }
+    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
+                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5), 38400,
+                   serial_hd(0), DEVICE_LITTLE_ENDIAN);
 
     /* I2C */
     object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
#3 lore raw
Quoted 1 line · Philippe Mathieu-Daudé

ping?

It's reviewed :

http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

I will send a PR when I have more patches.

Thanks,

C.

Quoted 49 lines · Philippe Mathieu-Daudé
Quoted 48 lines

The UART5 is present on the machine regardless there is a character device connected to it. Map it unconditionally.

---
 hw/arm/aspeed_ast2600.c | 8 +++-----
 hw/arm/aspeed_soc.c     | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)
hw/arm/aspeed_ast2600.c +3 -5
index 9d95e421435..1450bde7cf2 100644
@@ -325,11 +325,9 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
     }
 
     /* UART - attach an 8250 to the IO space as our UART5 */
-    if (serial_hd(0)) {
-        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
-        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
-                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
-    }
+    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
+                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5),
+                   38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
 
     /* I2C */
     object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
hw/arm/aspeed_soc.c +3 -5
index 35be126db6f..7eefd54ac07 100644
@@ -283,11 +283,9 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
     }
 
     /* UART - attach an 8250 to the IO space as our UART5 */
-    if (serial_hd(0)) {
-        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
-        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
-                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
-    }
+    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
+                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5), 38400,
+                   serial_hd(0), DEVICE_LITTLE_ENDIAN);
 
     /* I2C */
     object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
#4 lore raw
Quoted 7 lines · Cédric Le Goater
Quoted 1 line · Philippe Mathieu-Daudé

ping?

It's reviewed :

http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

Yes I know :) This is part of my routine to check if a patch hasn't been confirmed to be queued 1 week after the last review, to ping the maintainer (because some automatically flush patches older than 1month in their mailbox).

Quoted 1 line

I will send a PR when I have more patches.

Ah OK. I didn't know you would keep merging the Aspeed patches. Since this was a single patch, I thought it would go via the usual qemu-arm queue from Peter.

No rush, I just wanted to be sure the patch was not lost. Also, once a patch is queued, I understand it is the maintainer responsibility to keep rebasing the patch queued.

Thanks!

Phil.

Quoted 56 lines

Thanks,

C.

Quoted 49 lines · Philippe Mathieu-Daudé
Quoted 48 lines

The UART5 is present on the machine regardless there is a character device connected to it. Map it unconditionally.

---
 hw/arm/aspeed_ast2600.c | 8 +++-----
 hw/arm/aspeed_soc.c     | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)
hw/arm/aspeed_ast2600.c +3 -5
index 9d95e421435..1450bde7cf2 100644
@@ -325,11 +325,9 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
     }
 
     /* UART - attach an 8250 to the IO space as our UART5 */
-    if (serial_hd(0)) {
-        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
-        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
-                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
-    }
+    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
+                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5),
+                   38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
 
     /* I2C */
     object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
hw/arm/aspeed_soc.c +3 -5
index 35be126db6f..7eefd54ac07 100644
@@ -283,11 +283,9 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
     }
 
     /* UART - attach an 8250 to the IO space as our UART5 */
-    if (serial_hd(0)) {
-        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
-        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
-                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
-    }
+    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
+                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5), 38400,
+                   serial_hd(0), DEVICE_LITTLE_ENDIAN);
 
     /* I2C */
     object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
#5 lore raw
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 5 lines · Cédric Le Goater
Quoted 1 line · Philippe Mathieu-Daudé

ping?

It's reviewed :

Quoted 8 lines
Quoted 2 lines

http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

Yes I know :) This is part of my routine to check if a patch hasn't been confirmed to be queued 1 week after the last review, to ping the maintainer (because some automatically flush patches older than 1month in their mailbox).

ooh. That's brutal.

Quoted 5 lines
Quoted 1 line

I will send a PR when I have more patches.

Ah OK. I didn't know you would keep merging the Aspeed patches. Since this was a single patch, I thought it would go via the usual qemu-arm queue from Peter.

sure. It could also. Fine with me. I have only three for the moment.

Quoted 4 lines

No rush, I just wanted to be sure the patch was not lost. Also, once a patch is queued, I understand it is the maintainer responsibility to keep rebasing the patch queued.

yes. I know. I have been taking care of Andrew's ADC patches since 2017 ... cough cough :)

Cheers,

C.

#6 lore raw
Quoted 27 lines · Cédric Le Goater
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 5 lines · Cédric Le Goater
Quoted 1 line · Philippe Mathieu-Daudé

ping?

It's reviewed :

Quoted 8 lines
Quoted 2 lines

http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

Yes I know :) This is part of my routine to check if a patch hasn't been confirmed to be queued 1 week after the last review, to ping the maintainer (because some automatically flush patches older than 1month in their mailbox).

ooh. That's brutal.

Quoted 5 lines
Quoted 1 line

I will send a PR when I have more patches.

Ah OK. I didn't know you would keep merging the Aspeed patches. Since this was a single patch, I thought it would go via the usual qemu-arm queue from Peter.

sure. It could also. Fine with me. I have only three for the moment.

Quoted 7 lines
Quoted 4 lines

No rush, I just wanted to be sure the patch was not lost. Also, once a patch is queued, I understand it is the maintainer responsibility to keep rebasing the patch queued.

yes. I know. I have been taking care of Andrew's ADC patches since 2017 ... cough cough :)

Agh!

#7 lore raw
Quoted 35 lines · Andrew Jeffery
Quoted 32 lines · Cédric Le Goater
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 5 lines · Cédric Le Goater
Quoted 1 line · Philippe Mathieu-Daudé

ping?

It's reviewed :

Quoted 8 lines
Quoted 2 lines

http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

Yes I know :) This is part of my routine to check if a patch hasn't been confirmed to be queued 1 week after the last review, to ping the maintainer (because some automatically flush patches older than 1month in their mailbox).

ooh. That's brutal.

Quoted 5 lines
Quoted 1 line

I will send a PR when I have more patches.

Ah OK. I didn't know you would keep merging the Aspeed patches. Since this was a single patch, I thought it would go via the usual qemu-arm queue from Peter.

sure. It could also. Fine with me. I have only three for the moment.

Quoted 4 lines

No rush, I just wanted to be sure the patch was not lost. Also, once a patch is queued, I understand it is the maintainer responsibility to keep rebasing the patch queued.

Quoted 4 lines
Quoted 2 lines

yes. I know. I have been taking care of Andrew's ADC patches since 2017 ... cough cough :)

Agh!

Does that mean "I will work on it !" ? :)

C.

#8 lore raw
Quoted 36 lines · Cédric Le Goater
Quoted 35 lines · Andrew Jeffery
Quoted 32 lines · Cédric Le Goater
Quoted 6 lines · Philippe Mathieu-Daudé
Quoted 5 lines · Cédric Le Goater
Quoted 1 line · Philippe Mathieu-Daudé

ping?

It's reviewed :

Quoted 8 lines
Quoted 2 lines

http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

Yes I know :) This is part of my routine to check if a patch hasn't been confirmed to be queued 1 week after the last review, to ping the maintainer (because some automatically flush patches older than 1month in their mailbox).

ooh. That's brutal.

Quoted 5 lines
Quoted 1 line

I will send a PR when I have more patches.

Ah OK. I didn't know you would keep merging the Aspeed patches. Since this was a single patch, I thought it would go via the usual qemu-arm queue from Peter.

sure. It could also. Fine with me. I have only three for the moment.

Quoted 4 lines

No rush, I just wanted to be sure the patch was not lost. Also, once a patch is queued, I understand it is the maintainer responsibility to keep rebasing the patch queued.

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

yes. I know. I have been taking care of Andrew's ADC patches since 2017 ... cough cough :)

Agh!

Does that mean "I will work on it !" ? :)

I'll see what I can do, I've recently started to rearrange my task queue.

Andrew