aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/pci/pci-octeon.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-01-22 06:59:30 -0500
committerRalf Baechle <ralf@linux-mips.org>2013-02-01 04:00:22 -0500
commit7034228792cc561e79ff8600f02884bd4c80e287 (patch)
tree89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/pci/pci-octeon.c
parent405ab01c70e18058d9c01a1256769a61fc65413e (diff)
MIPS: Whitespace cleanup.
Having received another series of whitespace patches I decided to do this once and for all rather than dealing with this kind of patches trickling in forever. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci/pci-octeon.c')
-rw-r--r--arch/mips/pci/pci-octeon.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
index 5b5ed76c6f47..95c2ea815cac 100644
--- a/arch/mips/pci/pci-octeon.c
+++ b/arch/mips/pci/pci-octeon.c
@@ -30,8 +30,8 @@
30 * addresses. Use PCI endian swapping 1 so no address swapping is 30 * addresses. Use PCI endian swapping 1 so no address swapping is
31 * necessary. The Linux io routines will endian swap the data. 31 * necessary. The Linux io routines will endian swap the data.
32 */ 32 */
33#define OCTEON_PCI_IOSPACE_BASE 0x80011a0400000000ull 33#define OCTEON_PCI_IOSPACE_BASE 0x80011a0400000000ull
34#define OCTEON_PCI_IOSPACE_SIZE (1ull<<32) 34#define OCTEON_PCI_IOSPACE_SIZE (1ull<<32)
35 35
36/* Octeon't PCI controller uses did=3, subdid=3 for PCI memory. */ 36/* Octeon't PCI controller uses did=3, subdid=3 for PCI memory. */
37#define OCTEON_PCI_MEMSPACE_OFFSET (0x00011b0000000000ull) 37#define OCTEON_PCI_MEMSPACE_OFFSET (0x00011b0000000000ull)
@@ -68,10 +68,10 @@ enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID;
68 * 68 *
69 * @dev: The Linux PCI device structure for the device to map 69 * @dev: The Linux PCI device structure for the device to map
70 * @slot: The slot number for this device on __BUS 0__. Linux 70 * @slot: The slot number for this device on __BUS 0__. Linux
71 * enumerates through all the bridges and figures out the 71 * enumerates through all the bridges and figures out the
72 * slot on Bus 0 where this device eventually hooks to. 72 * slot on Bus 0 where this device eventually hooks to.
73 * @pin: The PCI interrupt pin read from the device, then swizzled 73 * @pin: The PCI interrupt pin read from the device, then swizzled
74 * as it goes through each bridge. 74 * as it goes through each bridge.
75 * Returns Interrupt number for the device 75 * Returns Interrupt number for the device
76 */ 76 */
77int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 77int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
@@ -120,8 +120,8 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
120 /* Enable the PCIe normal error reporting */ 120 /* Enable the PCIe normal error reporting */
121 config = PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */ 121 config = PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */
122 config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */ 122 config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */
123 config |= PCI_EXP_DEVCTL_FERE; /* Fatal Error Reporting */ 123 config |= PCI_EXP_DEVCTL_FERE; /* Fatal Error Reporting */
124 config |= PCI_EXP_DEVCTL_URRE; /* Unsupported Request */ 124 config |= PCI_EXP_DEVCTL_URRE; /* Unsupported Request */
125 pcie_capability_set_word(dev, PCI_EXP_DEVCTL, config); 125 pcie_capability_set_word(dev, PCI_EXP_DEVCTL, config);
126 126
127 /* Find the Advanced Error Reporting capability */ 127 /* Find the Advanced Error Reporting capability */
@@ -226,10 +226,10 @@ const char *octeon_get_pci_interrupts(void)
226 * 226 *
227 * @dev: The Linux PCI device structure for the device to map 227 * @dev: The Linux PCI device structure for the device to map
228 * @slot: The slot number for this device on __BUS 0__. Linux 228 * @slot: The slot number for this device on __BUS 0__. Linux
229 * enumerates through all the bridges and figures out the 229 * enumerates through all the bridges and figures out the
230 * slot on Bus 0 where this device eventually hooks to. 230 * slot on Bus 0 where this device eventually hooks to.
231 * @pin: The PCI interrupt pin read from the device, then swizzled 231 * @pin: The PCI interrupt pin read from the device, then swizzled
232 * as it goes through each bridge. 232 * as it goes through each bridge.
233 * Returns Interrupt number for the device 233 * Returns Interrupt number for the device
234 */ 234 */
235int __init octeon_pci_pcibios_map_irq(const struct pci_dev *dev, 235int __init octeon_pci_pcibios_map_irq(const struct pci_dev *dev,
@@ -404,8 +404,8 @@ static void octeon_pci_initialize(void)
404 ctl_status_2.s.bb1_siz = 1; /* BAR1 is 2GB */ 404 ctl_status_2.s.bb1_siz = 1; /* BAR1 is 2GB */
405 ctl_status_2.s.bb_ca = 1; /* Don't use L2 with big bars */ 405 ctl_status_2.s.bb_ca = 1; /* Don't use L2 with big bars */
406 ctl_status_2.s.bb_es = 1; /* Big bar in byte swap mode */ 406 ctl_status_2.s.bb_es = 1; /* Big bar in byte swap mode */
407 ctl_status_2.s.bb1 = 1; /* BAR1 is big */ 407 ctl_status_2.s.bb1 = 1; /* BAR1 is big */
408 ctl_status_2.s.bb0 = 1; /* BAR0 is big */ 408 ctl_status_2.s.bb0 = 1; /* BAR0 is big */
409 } 409 }
410 410
411 octeon_npi_write32(CVMX_NPI_PCI_CTL_STATUS_2, ctl_status_2.u32); 411 octeon_npi_write32(CVMX_NPI_PCI_CTL_STATUS_2, ctl_status_2.u32);
@@ -446,7 +446,7 @@ static void octeon_pci_initialize(void)
446 * count. [1..31] and 0=32. NOTE: If the user 446 * count. [1..31] and 0=32. NOTE: If the user
447 * programs these bits beyond the Designed Maximum 447 * programs these bits beyond the Designed Maximum
448 * outstanding count, then the designed maximum table 448 * outstanding count, then the designed maximum table
449 * depth will be used instead. No additional 449 * depth will be used instead. No additional
450 * Deferred/Split transactions will be accepted if 450 * Deferred/Split transactions will be accepted if
451 * this outstanding maximum count is 451 * this outstanding maximum count is
452 * reached. Furthermore, no additional deferred/split 452 * reached. Furthermore, no additional deferred/split
@@ -456,7 +456,7 @@ static void octeon_pci_initialize(void)
456 cfg19.s.tdomc = 4; 456 cfg19.s.tdomc = 4;
457 /* 457 /*
458 * Master Deferred Read Request Outstanding Max Count 458 * Master Deferred Read Request Outstanding Max Count
459 * (PCI only). CR4C[26:24] Max SAC cycles MAX DAC 459 * (PCI only). CR4C[26:24] Max SAC cycles MAX DAC
460 * cycles 000 8 4 001 1 0 010 2 1 011 3 1 100 4 2 101 460 * cycles 000 8 4 001 1 0 010 2 1 011 3 1 100 4 2 101
461 * 5 2 110 6 3 111 7 3 For example, if these bits are 461 * 5 2 110 6 3 111 7 3 For example, if these bits are
462 * programmed to 100, the core can support 2 DAC 462 * programmed to 100, the core can support 2 DAC
@@ -550,7 +550,7 @@ static void octeon_pci_initialize(void)
550 550
551 /* 551 /*
552 * Affects PCI performance when OCTEON services reads to its 552 * Affects PCI performance when OCTEON services reads to its
553 * BAR1/BAR2. Refer to Section 10.6.1. The recommended values are 553 * BAR1/BAR2. Refer to Section 10.6.1. The recommended values are
554 * 0x22, 0x33, and 0x33 for PCI_READ_CMD_6, PCI_READ_CMD_C, and 554 * 0x22, 0x33, and 0x33 for PCI_READ_CMD_6, PCI_READ_CMD_C, and
555 * PCI_READ_CMD_E, respectively. Unfortunately due to errata DDR-700, 555 * PCI_READ_CMD_E, respectively. Unfortunately due to errata DDR-700,
556 * these values need to be changed so they won't possibly prefetch off 556 * these values need to be changed so they won't possibly prefetch off