From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzDP8-0007CX-Qu for qemu-devel@nongnu.org; Mon, 23 Jun 2014 19:12:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzDP3-0003St-IU for qemu-devel@nongnu.org; Mon, 23 Jun 2014 19:12:02 -0400 Received: from gate.crashing.org ([63.228.1.57]:40460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzDP3-0003Sl-53 for qemu-devel@nongnu.org; Mon, 23 Jun 2014 19:11:57 -0400 From: Benjamin Herrenschmidt Date: Tue, 24 Jun 2014 09:11:08 +1000 Message-Id: <1403565068-15229-15-git-send-email-benh@kernel.crashing.org> In-Reply-To: <1403565068-15229-1-git-send-email-benh@kernel.crashing.org> References: <1403565068-15229-1-git-send-email-benh@kernel.crashing.org> Subject: [Qemu-devel] [RFC 14/14] ppc/spapr/vga: Switch VGA endian on H_SET_MODE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann When the guest switches the interrupt endian mode, which essentially means a global machine endian switch, we want to change the VGA framebuffer endian mode as well in order to be backward compatible with existing guests who don't know about the new endian control register. Signed-off-by: Benjamin Herrenschmidt --- hw/display/vga-pci.c | 8 ++++++++ hw/ppc/spapr_hcall.c | 2 ++ hw/ppc/spapr_pci.c | 26 ++++++++++++++++++++++++++ include/hw/pci/pci.h | 1 + include/hw/ppc/spapr.h | 1 + 5 files changed, 38 insertions(+) diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index 0351d94..e2abc8c 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -212,6 +212,14 @@ static void pci_secondary_vga_reset(DeviceState *dev) vga_common_reset(&d->vga); } +void pci_vga_switch_fb_endian(DeviceState *dev, bool big_endian) +{ + PCIVGAState *d = DO_UPCAST(PCIVGAState, dev.qdev, dev); + VGACommonState *s = &d->vga; + + s->big_endian_fb = big_endian; +} + static Property vga_pci_properties[] = { DEFINE_PROP_UINT32("vgamem_mb", PCIVGAState, vga.vram_size_mb, 16), DEFINE_PROP_BIT("mmio", PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_MMIO, true), diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 7952077..e52f22d 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -731,12 +731,14 @@ static target_ulong h_set_mode_resouce_le(PowerPCCPU *cpu, CPU_FOREACH(cs) { set_spr(cs, SPR_LPCR, 0, LPCR_ILE); } + spapr_pci_switch_vga(true); return H_SUCCESS; case H_SET_MODE_ENDIAN_LITTLE: CPU_FOREACH(cs) { set_spr(cs, SPR_LPCR, LPCR_ILE, LPCR_ILE); } + spapr_pci_switch_vga(false); return H_SUCCESS; } diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 988f8cb..99ae3cd 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -926,3 +926,29 @@ static void spapr_pci_register_types(void) } type_init(spapr_pci_register_types) + +static int spapr_switch_one_vga(DeviceState *dev, void *opaque) +{ + bool be = *(bool *)opaque; + + if (!strcmp(object_get_typename(OBJECT(dev)), "VGA")) { + pci_vga_switch_fb_endian(dev, be); + } + return 0; +} + +void spapr_pci_switch_vga(bool big_endian) +{ + sPAPRPHBState *sphb; + + /* + * For backward compatibility with existing guests, we switch + * the endianness of the VGA controller when changing the guest + * interrupt mode + */ + QLIST_FOREACH(sphb, &spapr->phbs, list) { + BusState *bus = &PCI_HOST_BRIDGE(sphb)->bus->qbus; + qbus_walk_children(bus, spapr_switch_one_vga, NULL, NULL, NULL, + &big_endian); + } +} diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 8c25ae5..bea4aff 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -373,6 +373,7 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, const char *default_devaddr); PCIDevice *pci_vga_init(PCIBus *bus); +void pci_vga_switch_fb_endian(DeviceState *dev, bool big_endian); int pci_bus_num(PCIBus *s); void pci_for_each_device(PCIBus *bus, int bus_num, diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 08c301f..e3e7aff 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -425,5 +425,6 @@ int spapr_dma_dt(void *fdt, int node_off, const char *propname, uint32_t liobn, uint64_t window, uint32_t size); int spapr_tcet_dma_dt(void *fdt, int node_off, const char *propname, sPAPRTCETable *tcet); +void spapr_pci_switch_vga(bool big_endian); #endif /* !defined (__HW_SPAPR_H__) */ -- 1.9.1