* [Qemu-devel] [PATCH 1/2] ppc/e500_pci: Fix code style
@ 2011-09-30 3:52 Liu Yu
2011-09-30 3:52 ` [Qemu-devel] [PATCH v2 2/2] ppc/e500_pci: Fix an array overflow issue Liu Yu
2011-10-01 13:05 ` [Qemu-devel] [Qemu-ppc] [PATCH 1/2] ppc/e500_pci: Fix code style Andreas Färber
0 siblings, 2 replies; 4+ messages in thread
From: Liu Yu @ 2011-09-30 3:52 UTC (permalink / raw)
To: agraf; +Cc: Liu Yu, qemu-ppc, qemu-devel
Put trailing statements on next line.
Signed-off-by: Liu Yu <yu.liu@freescale.com>
---
hw/ppce500_pci.c | 76 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c
index 2db365d..0ece422 100644
--- a/hw/ppce500_pci.c
+++ b/hw/ppce500_pci.c
@@ -98,11 +98,20 @@ static uint32_t pci_reg_read4(void *opaque, target_phys_addr_t addr)
case PPCE500_PCI_OW3:
case PPCE500_PCI_OW4:
switch (addr & 0xC) {
- case PCI_POTAR: value = pci->pob[(addr >> 5) & 0x7].potar; break;
- case PCI_POTEAR: value = pci->pob[(addr >> 5) & 0x7].potear; break;
- case PCI_POWBAR: value = pci->pob[(addr >> 5) & 0x7].powbar; break;
- case PCI_POWAR: value = pci->pob[(addr >> 5) & 0x7].powar; break;
- default: break;
+ case PCI_POTAR:
+ value = pci->pob[(addr >> 5) & 0x7].potar;
+ break;
+ case PCI_POTEAR:
+ value = pci->pob[(addr >> 5) & 0x7].potear;
+ break;
+ case PCI_POWBAR:
+ value = pci->pob[(addr >> 5) & 0x7].powbar;
+ break;
+ case PCI_POWAR:
+ value = pci->pob[(addr >> 5) & 0x7].powar;
+ break;
+ default:
+ break;
}
break;
@@ -110,11 +119,20 @@ static uint32_t pci_reg_read4(void *opaque, target_phys_addr_t addr)
case PPCE500_PCI_IW2:
case PPCE500_PCI_IW1:
switch (addr & 0xC) {
- case PCI_PITAR: value = pci->pib[(addr >> 5) & 0x3].pitar; break;
- case PCI_PIWBAR: value = pci->pib[(addr >> 5) & 0x3].piwbar; break;
- case PCI_PIWBEAR: value = pci->pib[(addr >> 5) & 0x3].piwbear; break;
- case PCI_PIWAR: value = pci->pib[(addr >> 5) & 0x3].piwar; break;
- default: break;
+ case PCI_PITAR:
+ value = pci->pib[(addr >> 5) & 0x3].pitar;
+ break;
+ case PCI_PIWBAR:
+ value = pci->pib[(addr >> 5) & 0x3].piwbar;
+ break;
+ case PCI_PIWBEAR:
+ value = pci->pib[(addr >> 5) & 0x3].piwbear;
+ break;
+ case PCI_PIWAR:
+ value = pci->pib[(addr >> 5) & 0x3].piwar;
+ break;
+ default:
+ break;
};
break;
@@ -154,11 +172,20 @@ static void pci_reg_write4(void *opaque, target_phys_addr_t addr,
case PPCE500_PCI_OW3:
case PPCE500_PCI_OW4:
switch (addr & 0xC) {
- case PCI_POTAR: pci->pob[(addr >> 5) & 0x7].potar = value; break;
- case PCI_POTEAR: pci->pob[(addr >> 5) & 0x7].potear = value; break;
- case PCI_POWBAR: pci->pob[(addr >> 5) & 0x7].powbar = value; break;
- case PCI_POWAR: pci->pob[(addr >> 5) & 0x7].powar = value; break;
- default: break;
+ case PCI_POTAR:
+ pci->pob[(addr >> 5) & 0x7].potar = value;
+ break;
+ case PCI_POTEAR:
+ pci->pob[(addr >> 5) & 0x7].potear = value;
+ break;
+ case PCI_POWBAR:
+ pci->pob[(addr >> 5) & 0x7].powbar = value;
+ break;
+ case PCI_POWAR:
+ pci->pob[(addr >> 5) & 0x7].powar = value;
+ break;
+ default:
+ break;
};
break;
@@ -166,11 +193,20 @@ static void pci_reg_write4(void *opaque, target_phys_addr_t addr,
case PPCE500_PCI_IW2:
case PPCE500_PCI_IW1:
switch (addr & 0xC) {
- case PCI_PITAR: pci->pib[(addr >> 5) & 0x3].pitar = value; break;
- case PCI_PIWBAR: pci->pib[(addr >> 5) & 0x3].piwbar = value; break;
- case PCI_PIWBEAR: pci->pib[(addr >> 5) & 0x3].piwbear = value; break;
- case PCI_PIWAR: pci->pib[(addr >> 5) & 0x3].piwar = value; break;
- default: break;
+ case PCI_PITAR:
+ pci->pib[(addr >> 5) & 0x3].pitar = value;
+ break;
+ case PCI_PIWBAR:
+ pci->pib[(addr >> 5) & 0x3].piwbar = value;
+ break;
+ case PCI_PIWBEAR:
+ pci->pib[(addr >> 5) & 0x3].piwbear = value;
+ break;
+ case PCI_PIWAR:
+ pci->pib[(addr >> 5) & 0x3].piwar = value;
+ break;
+ default:
+ break;
};
break;
--
1.6.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2 2/2] ppc/e500_pci: Fix an array overflow issue
2011-09-30 3:52 [Qemu-devel] [PATCH 1/2] ppc/e500_pci: Fix code style Liu Yu
@ 2011-09-30 3:52 ` Liu Yu
2011-10-07 6:55 ` Alexander Graf
2011-10-01 13:05 ` [Qemu-devel] [Qemu-ppc] [PATCH 1/2] ppc/e500_pci: Fix code style Andreas Färber
1 sibling, 1 reply; 4+ messages in thread
From: Liu Yu @ 2011-09-30 3:52 UTC (permalink / raw)
To: agraf; +Cc: Liu Yu, qemu-ppc, qemu-devel
When access PPCE500_PCI_IW1 the previous index get overflow.
The patch fix the issue and update all to keep consistent style.
Signed-off-by: Liu Yu <yu.liu@freescale.com>
---
v2:
also apply idx for outbound to keep consistent style.
hw/ppce500_pci.c | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c
index 0ece422..960a5d0 100644
--- a/hw/ppce500_pci.c
+++ b/hw/ppce500_pci.c
@@ -89,6 +89,7 @@ static uint32_t pci_reg_read4(void *opaque, target_phys_addr_t addr)
PPCE500PCIState *pci = opaque;
unsigned long win;
uint32_t value = 0;
+ int idx;
win = addr & 0xfe0;
@@ -97,18 +98,19 @@ static uint32_t pci_reg_read4(void *opaque, target_phys_addr_t addr)
case PPCE500_PCI_OW2:
case PPCE500_PCI_OW3:
case PPCE500_PCI_OW4:
+ idx = (addr >> 5) & 0x7;
switch (addr & 0xC) {
case PCI_POTAR:
- value = pci->pob[(addr >> 5) & 0x7].potar;
+ value = pci->pob[idx].potar;
break;
case PCI_POTEAR:
- value = pci->pob[(addr >> 5) & 0x7].potear;
+ value = pci->pob[idx].potear;
break;
case PCI_POWBAR:
- value = pci->pob[(addr >> 5) & 0x7].powbar;
+ value = pci->pob[idx].powbar;
break;
case PCI_POWAR:
- value = pci->pob[(addr >> 5) & 0x7].powar;
+ value = pci->pob[idx].powar;
break;
default:
break;
@@ -118,18 +120,19 @@ static uint32_t pci_reg_read4(void *opaque, target_phys_addr_t addr)
case PPCE500_PCI_IW3:
case PPCE500_PCI_IW2:
case PPCE500_PCI_IW1:
+ idx = ((addr >> 5) & 0x3) - 1;
switch (addr & 0xC) {
case PCI_PITAR:
- value = pci->pib[(addr >> 5) & 0x3].pitar;
+ value = pci->pib[idx].pitar;
break;
case PCI_PIWBAR:
- value = pci->pib[(addr >> 5) & 0x3].piwbar;
+ value = pci->pib[idx].piwbar;
break;
case PCI_PIWBEAR:
- value = pci->pib[(addr >> 5) & 0x3].piwbear;
+ value = pci->pib[idx].piwbear;
break;
case PCI_PIWAR:
- value = pci->pib[(addr >> 5) & 0x3].piwar;
+ value = pci->pib[idx].piwar;
break;
default:
break;
@@ -160,6 +163,7 @@ static void pci_reg_write4(void *opaque, target_phys_addr_t addr,
{
PPCE500PCIState *pci = opaque;
unsigned long win;
+ int idx;
win = addr & 0xfe0;
@@ -171,18 +175,19 @@ static void pci_reg_write4(void *opaque, target_phys_addr_t addr,
case PPCE500_PCI_OW2:
case PPCE500_PCI_OW3:
case PPCE500_PCI_OW4:
+ idx = (addr >> 5) & 0x7;
switch (addr & 0xC) {
case PCI_POTAR:
- pci->pob[(addr >> 5) & 0x7].potar = value;
+ pci->pob[idx].potar = value;
break;
case PCI_POTEAR:
- pci->pob[(addr >> 5) & 0x7].potear = value;
+ pci->pob[idx].potear = value;
break;
case PCI_POWBAR:
- pci->pob[(addr >> 5) & 0x7].powbar = value;
+ pci->pob[idx].powbar = value;
break;
case PCI_POWAR:
- pci->pob[(addr >> 5) & 0x7].powar = value;
+ pci->pob[idx].powar = value;
break;
default:
break;
@@ -192,18 +197,19 @@ static void pci_reg_write4(void *opaque, target_phys_addr_t addr,
case PPCE500_PCI_IW3:
case PPCE500_PCI_IW2:
case PPCE500_PCI_IW1:
+ idx = ((addr >> 5) & 0x3) - 1;
switch (addr & 0xC) {
case PCI_PITAR:
- pci->pib[(addr >> 5) & 0x3].pitar = value;
+ pci->pib[idx].pitar = value;
break;
case PCI_PIWBAR:
- pci->pib[(addr >> 5) & 0x3].piwbar = value;
+ pci->pib[idx].piwbar = value;
break;
case PCI_PIWBEAR:
- pci->pib[(addr >> 5) & 0x3].piwbear = value;
+ pci->pib[idx].piwbear = value;
break;
case PCI_PIWAR:
- pci->pib[(addr >> 5) & 0x3].piwar = value;
+ pci->pib[idx].piwar = value;
break;
default:
break;
--
1.6.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH 1/2] ppc/e500_pci: Fix code style
2011-09-30 3:52 [Qemu-devel] [PATCH 1/2] ppc/e500_pci: Fix code style Liu Yu
2011-09-30 3:52 ` [Qemu-devel] [PATCH v2 2/2] ppc/e500_pci: Fix an array overflow issue Liu Yu
@ 2011-10-01 13:05 ` Andreas Färber
1 sibling, 0 replies; 4+ messages in thread
From: Andreas Färber @ 2011-10-01 13:05 UTC (permalink / raw)
To: Liu Yu; +Cc: qemu-ppc, agraf, qemu-devel
Am 30.09.2011 um 05:52 schrieb Liu Yu:
> Put trailing statements on next line.
>
> Signed-off-by: Liu Yu <yu.liu@freescale.com>
Reviewed-by: Andreas Färber <andreas.faerber@web.de>
Not only fixes Coding Style but also improves readability by
consistent indentation IMO.
Note that there are also three superfluous semicolons after the
closing braces following the sections touched herein.
Andreas
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/2] ppc/e500_pci: Fix an array overflow issue
2011-09-30 3:52 ` [Qemu-devel] [PATCH v2 2/2] ppc/e500_pci: Fix an array overflow issue Liu Yu
@ 2011-10-07 6:55 ` Alexander Graf
0 siblings, 0 replies; 4+ messages in thread
From: Alexander Graf @ 2011-10-07 6:55 UTC (permalink / raw)
To: Liu Yu; +Cc: qemu-ppc, qemu-devel
On 30.09.2011, at 05:52, Liu Yu wrote:
> When access PPCE500_PCI_IW1 the previous index get overflow.
> The patch fix the issue and update all to keep consistent style.
>
> Signed-off-by: Liu Yu <yu.liu@freescale.com>
Thanks, applied both to my local ppc-next tree. Will push once Blue pulled the request.
Alex
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-07 6:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-30 3:52 [Qemu-devel] [PATCH 1/2] ppc/e500_pci: Fix code style Liu Yu
2011-09-30 3:52 ` [Qemu-devel] [PATCH v2 2/2] ppc/e500_pci: Fix an array overflow issue Liu Yu
2011-10-07 6:55 ` Alexander Graf
2011-10-01 13:05 ` [Qemu-devel] [Qemu-ppc] [PATCH 1/2] ppc/e500_pci: Fix code style Andreas Färber
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).