[coreboot-gerrit] Patch set updated for coreboot: e609499 southbridge/amd/rsXY0/cmn.c: Trivial - Style fixes
Edward O'Callaghan (eocallaghan@alterapraxis.com)
gerrit at coreboot.org
Sat Jun 28 18:07:31 CEST 2014
Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6155
-gerrit
commit e60949941cef7d084225a049b031121f578d102c
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date: Sat Jun 28 22:47:22 2014 +1000
southbridge/amd/rsXY0/cmn.c: Trivial - Style fixes
Alphabetize headers, remove some ASCII art past 80 columns.
Change-Id: I00ad79f2e1ddd78935efcfab19d9e166f0349ae3
Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
src/southbridge/amd/rs690/cmn.c | 52 ++++++++++++++++++----------------------
src/southbridge/amd/rs780/cmn.c | 53 +++++++++++++++++++----------------------
2 files changed, 47 insertions(+), 58 deletions(-)
diff --git a/src/southbridge/amd/rs690/cmn.c b/src/southbridge/amd/rs690/cmn.c
index 36870b3..6c8b3e6 100644
--- a/src/southbridge/amd/rs690/cmn.c
+++ b/src/southbridge/amd/rs690/cmn.c
@@ -17,17 +17,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/console.h>
-
#include <arch/io.h>
-
+#include <cpu/amd/mtrr.h>
+#include <console/console.h>
+#include <cpu/x86/msr.h>
+#include <delay.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
-#include <cpu/amd/mtrr.h>
-#include <delay.h>
+
#include "rs690.h"
static u32 nb_read_index(device_t dev, u32 index_reg, u32 index)
@@ -47,7 +46,7 @@ static void nb_write_index(device_t dev, u32 index_reg, u32 index, u32 data)
/* extension registers */
u32 pci_ext_read_config32(device_t nb_dev, device_t dev, u32 reg)
{
- /*get BAR3 base address for nbcfg0x1c */
+ /* get BAR3 base address for nbcfg0x1c */
u32 addr = pci_read_config32(nb_dev, 0x1c) & ~0xF;
printk(BIOS_DEBUG, "addr=%x,bus=%x,devfn=%x\n", addr, dev->bus->secondary,
dev->path.pci.devfn);
@@ -60,7 +59,7 @@ void pci_ext_write_config32(device_t nb_dev, device_t dev, u32 reg_pos, u32 mask
{
u32 reg_old, reg;
- /*get BAR3 base address for nbcfg0x1c */
+ /* get BAR3 base address for nbcfg0x1c */
u32 addr = pci_read_config32(nb_dev, 0x1c) & ~0xF;
/*printk(BIOS_DEBUG, "write: addr=%x,bus=%x,devfn=%x\n", addr, dev->bus->secondary,
dev->path.pci.devfn);*/
@@ -191,12 +190,12 @@ void set_pcie_enable_bits(device_t dev, u32 reg_pos, u32 mask, u32 val)
}
}
-/***********************************************************
-* To access bar3 we need to program PCI MMIO 7 in K8.
-* in_out:
-* 1: enable/enter k8 temp mmio base
-* 0: disable/restore
-***********************************************************/
+/*
+ * To access bar3 we need to program PCI MMIO 7 in K8.
+ * in_out:
+ * 1: enable/enter k8 temp mmio base
+ * 0: disable/restore
+ */
void ProgK8TempMmioBase(u8 in_out, u32 pcie_base_add, u32 mmio_base_add)
{
/* K8 Function1 is address map */
@@ -245,11 +244,11 @@ void PcieReleasePortTraining(device_t nb_dev, device_t dev, u32 port)
}
}
-/********************************************************************************************************
-* Output:
-* 0: no device is present.
-* 1: device is present and is trained.
-********************************************************************************************************/
+/*
+ * Output:
+ * 0: no device is present.
+ * 1: device is present and is trained.
+ */
u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port)
{
u16 count = 5000;
@@ -278,17 +277,13 @@ u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port)
count = 0;
break;
case 0x10:
- reg =
- pci_ext_read_config32(nb_dev, dev,
- PCIE_VC0_RESOURCE_STATUS);
+ reg = pci_ext_read_config32(nb_dev, dev, PCIE_VC0_RESOURCE_STATUS);
printk(BIOS_DEBUG, "PcieTrainPort reg=0x%x\n", reg);
/* check bit1 */
if (reg & VC_NEGOTIATION_PENDING) { /* bit1=1 means the link needs to be re-trained. */
/* set bit8=1, bit0-2=bit4-6 */
u32 tmp;
- reg =
- nbpcie_p_read_index(dev,
- PCIE_LC_LINK_WIDTH);
+ reg = nbpcie_p_read_index(dev, PCIE_LC_LINK_WIDTH);
tmp = (reg >> 4) && 0x3; /* get bit4-6 */
reg &= 0xfff8; /* clear bit0-2 */
reg += tmp; /* merge */
@@ -309,9 +304,9 @@ u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port)
}
/*
-* Compliant with CIM_33's ATINB_SetToms.
-* Set Top Of Memory below and above 4G.
-*/
+ * Compliant with CIM_33's ATINB_SetToms.
+ * Set Top Of Memory below and above 4G.
+ */
void rs690_set_tom(device_t nb_dev)
{
/* set TOM */
@@ -324,4 +319,3 @@ void rs690_set_tom(device_t nb_dev)
nbmc_write_index(nb_dev, 0x1e, 0x38000000);
#endif
}
-
diff --git a/src/southbridge/amd/rs780/cmn.c b/src/southbridge/amd/rs780/cmn.c
index cf09b9a..ce81374 100644
--- a/src/southbridge/amd/rs780/cmn.c
+++ b/src/southbridge/amd/rs780/cmn.c
@@ -17,18 +17,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/console.h>
-
#include <arch/io.h>
-
+#include <console/console.h>
+#include <cpu/amd/mtrr.h>
+#include <cpu/cpu.h>
+#include <cpu/x86/msr.h>
+#include <delay.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
-#include <cpu/amd/mtrr.h>
-#include <delay.h>
-#include <cpu/cpu.h>
+
#include "rs780.h"
static u32 nb_read_index(device_t dev, u32 index_reg, u32 index)
@@ -46,7 +45,7 @@ static void nb_write_index(device_t dev, u32 index_reg, u32 index, u32 data)
/* extension registers */
u32 pci_ext_read_config32(device_t nb_dev, device_t dev, u32 reg)
{
- /*get BAR3 base address for nbcfg0x1c */
+ /* get BAR3 base address for nbcfg0x1c */
u32 addr = pci_read_config32(nb_dev, 0x1c) & ~0xF;
printk(BIOS_DEBUG, "addr=%x,bus=%x,devfn=%x\n", addr, dev->bus->secondary,
dev->path.pci.devfn);
@@ -59,7 +58,7 @@ void pci_ext_write_config32(device_t nb_dev, device_t dev, u32 reg_pos, u32 mask
{
u32 reg_old, reg;
- /*get BAR3 base address for nbcfg0x1c */
+ /* get BAR3 base address for nbcfg0x1c */
u32 addr = pci_read_config32(nb_dev, 0x1c) & ~0xF;
/*printk(BIOS_DEBUG, "write: addr=%x,bus=%x,devfn=%x\n", addr, dev->bus->secondary,
dev->path.pci.devfn);*/
@@ -190,12 +189,12 @@ void set_pcie_enable_bits(device_t dev, u32 reg_pos, u32 mask, u32 val)
}
}
-/***********************************************************
-* To access bar3 we need to program PCI MMIO 7 in K8.
-* in_out:
-* 1: enable/enter k8 temp mmio base
-* 0: disable/restore
-***********************************************************/
+/*
+ * To access bar3 we need to program PCI MMIO 7 in K8.
+ * in_out:
+ * 1: enable/enter k8 temp mmio base
+ * 0: disable/restore
+ */
void ProgK8TempMmioBase(u8 in_out, u32 pcie_base_add, u32 mmio_base_add)
{
/* K8 Function1 is address map */
@@ -249,11 +248,11 @@ void PcieReleasePortTraining(device_t nb_dev, device_t dev, u32 port)
}
}
-/********************************************************************************************************
-* Output:
-* 0: no device is present.
-* 1: device is present and is trained.
-********************************************************************************************************/
+/*
+ * Output:
+ * 0: no device is present.
+ * 1: device is present and is trained.
+ */
u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port)
{
u16 count = 5000;
@@ -319,17 +318,13 @@ u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port)
count = 0;
break;
case 0x10:
- reg =
- pci_ext_read_config32(nb_dev, dev,
- PCIE_VC0_RESOURCE_STATUS);
+ reg = pci_ext_read_config32(nb_dev, dev, PCIE_VC0_RESOURCE_STATUS);
printk(BIOS_DEBUG, "PcieTrainPort reg=0x%x\n", reg);
/* check bit1 */
if (reg & VC_NEGOTIATION_PENDING) { /* bit1=1 means the link needs to be re-trained. */
/* set bit8=1, bit0-2=bit4-6 */
u32 tmp;
- reg =
- nbpcie_p_read_index(dev,
- PCIE_LC_LINK_WIDTH);
+ reg = nbpcie_p_read_index(dev, PCIE_LC_LINK_WIDTH);
tmp = (reg >> 4) && 0x3; /* get bit4-6 */
reg &= 0xfff8; /* clear bit0-2 */
reg += tmp; /* merge */
@@ -350,9 +345,9 @@ u8 PcieTrainPort(device_t nb_dev, device_t dev, u32 port)
}
/*
-* Compliant with CIM_33's ATINB_SetToms.
-* Set Top Of Memory below and above 4G.
-*/
+ * Compliant with CIM_33's ATINB_SetToms.
+ * Set Top Of Memory below and above 4G.
+ */
void rs780_set_tom(device_t nb_dev)
{
/* set TOM */
More information about the coreboot-gerrit
mailing list