<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23538">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/amd/serengeti_cheetah: Fix coding style<br><br>Change-Id: I380368873e0508c3a55ac1c4ea0de172e675cf3a<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/mainboard/amd/serengeti_cheetah/acpi_tables.c<br>M src/mainboard/amd/serengeti_cheetah/mptable.c<br>2 files changed, 29 insertions(+), 37 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/23538/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c</span><br><span>index 41e12eb..d700e1d 100644</span><br><span>--- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c</span><br><span>+++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c</span><br><span>@@ -57,7 +57,7 @@</span><br><span> res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span> if (res) {</span><br><span> current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132_1,</span><br><span style="color: hsl(0, 100%, 40%);">- res->base, gsi_base );</span><br><span style="color: hsl(120, 100%, 40%);">+ res->base, gsi_base);</span><br><span> gsi_base+=7;</span><br><span> </span><br><span> }</span><br><span>@@ -67,7 +67,7 @@</span><br><span> res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span> if (res) {</span><br><span> current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132_2,</span><br><span style="color: hsl(0, 100%, 40%);">- res->base, gsi_base );</span><br><span style="color: hsl(120, 100%, 40%);">+ res->base, gsi_base);</span><br><span> gsi_base+=7;</span><br><span> }</span><br><span> }</span><br><span>@@ -75,9 +75,10 @@</span><br><span> int i;</span><br><span> int j = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for(i = 1; i< sysconf.hc_possible_num; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 1; i < sysconf.hc_possible_num; i++) {</span><br><span> u32 d = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if(!(sysconf.pci1234[i] & 0x1) ) continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(sysconf.pci1234[i] & 0x1))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> /* 8131 need to use +4 */</span><br><span> switch (sysconf.hcid[i]) {</span><br><span> case 1:</span><br><span>@@ -95,7 +96,7 @@</span><br><span> res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span> if (res) {</span><br><span> current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132a[j][0],</span><br><span style="color: hsl(0, 100%, 40%);">- res->base, gsi_base );</span><br><span style="color: hsl(120, 100%, 40%);">+ res->base, gsi_base);</span><br><span> gsi_base+=d;</span><br><span> }</span><br><span> }</span><br><span>@@ -104,7 +105,7 @@</span><br><span> res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span> if (res) {</span><br><span> current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132a[j][1],</span><br><span style="color: hsl(0, 100%, 40%);">- res->base, gsi_base );</span><br><span style="color: hsl(120, 100%, 40%);">+ res->base, gsi_base);</span><br><span> gsi_base+=d;</span><br><span> </span><br><span> }</span><br><span>@@ -116,7 +117,7 @@</span><br><span> }</span><br><span> </span><br><span> current += acpi_create_madt_irqoverride( (acpi_madt_irqoverride_t *)</span><br><span style="color: hsl(0, 100%, 40%);">- current, 0, 0, 2, 5 );</span><br><span style="color: hsl(120, 100%, 40%);">+ current, 0, 0, 2, 5);</span><br><span> /* 0: mean bus 0--->ISA */</span><br><span> /* 0: PIC 0 */</span><br><span> /* 2: APIC 2 */</span><br><span>@@ -147,16 +148,15 @@</span><br><span> </span><br><span> /* same htio, but different position? We may have to copy, change HCIN, and recalculate the checknum and add_table */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for(i = 1; i < sysconf.hc_possible_num; i++) { /* 0: is hc sblink */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 1; i < sysconf.hc_possible_num; i++) { /* 0: is hc sblink */</span><br><span> const char *file_name;</span><br><span style="color: hsl(0, 100%, 40%);">- if((sysconf.pci1234[i] & 1) != 1 ) continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((sysconf.pci1234[i] & 1) != 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> u8 c;</span><br><span style="color: hsl(0, 100%, 40%);">- if(i < 7) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (i < 7)</span><br><span> c = (u8) ('4' + i - 1);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span> c = (u8) ('A' + i - 1 - 6);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> current = ALIGN(current, 8);</span><br><span> printk(BIOS_DEBUG, "ACPI: * SSDT for PCI%c Aka hcid = %d\n", c, sysconf.hcid[i]); /* pci0 and pci1 are in dsdt */</span><br><span> ssdtx = (acpi_header_t *)current;</span><br><span>diff --git a/src/mainboard/amd/serengeti_cheetah/mptable.c b/src/mainboard/amd/serengeti_cheetah/mptable.c</span><br><span>index 0210368..9b05fc0 100644</span><br><span>--- a/src/mainboard/amd/serengeti_cheetah/mptable.c</span><br><span>+++ b/src/mainboard/amd/serengeti_cheetah/mptable.c</span><br><span>@@ -49,24 +49,23 @@</span><br><span> dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(m->sbdn3, 1));</span><br><span> if (dev) {</span><br><span> res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (res) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (res)</span><br><span> smp_write_ioapic(mc, m->apicid_8132_1, 0x11,</span><br><span> res2mmio(res, 0, 0));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(m->sbdn3+1, 1));</span><br><span> if (dev) {</span><br><span> res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (res) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (res)</span><br><span> smp_write_ioapic(mc, m->apicid_8132_2, 0x11,</span><br><span> res2mmio(res, 0, 0));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> </span><br><span> j = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for(i = 1; i< sysconf.hc_possible_num; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if(!(sysconf.pci1234[i] & 0x1) ) continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 1; i < sysconf.hc_possible_num; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(sysconf.pci1234[i] & 0x1))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> </span><br><span> switch(sysconf.hcid[i]) {</span><br><span> case 1: /* 8132 */</span><br><span>@@ -74,18 +73,16 @@</span><br><span> dev = dev_find_slot(m->bus_8132a[j][0], PCI_DEVFN(m->sbdn3a[j], 1));</span><br><span> if (dev) {</span><br><span> res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (res) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (res)</span><br><span> smp_write_ioapic(mc, m->apicid_8132a[j][0], 0x11,</span><br><span> res2mmio(res, 0, 0));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> dev = dev_find_slot(m->bus_8132a[j][0], PCI_DEVFN(m->sbdn3a[j]+1, 1));</span><br><span> if (dev) {</span><br><span> res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (res) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (res)</span><br><span> smp_write_ioapic(mc, m->apicid_8132a[j][1], 0x11,</span><br><span> res2mmio(res, 0, 0));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> break;</span><br><span> }</span><br><span>@@ -104,32 +101,29 @@</span><br><span> smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8111_1, (0 << 2)|3, m->apicid_8111, 0x13);</span><br><span> </span><br><span> /*Slot 3 PCI 32 */</span><br><span style="color: hsl(0, 100%, 40%);">- for(i = 0; i < 4; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 4; i++)</span><br><span> smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8111_1, (5 << 2)|i, m->apicid_8111, 0x10 + (1+i)%4); /* 16 */</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> </span><br><span> /* Slot 4 PCI 32 */</span><br><span style="color: hsl(0, 100%, 40%);">- for(i = 0; i < 4; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 4; i++)</span><br><span> smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8111_1, (4 << 2)|i, m->apicid_8111, 0x10 + (0+i)%4); /* 16 */</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> </span><br><span> /* Slot 1 PCI-X 133/100/66 */</span><br><span style="color: hsl(0, 100%, 40%);">- for(i = 0; i < 4; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 4; i++)</span><br><span> smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8132_2, (1 << 2)|i, m->apicid_8132_2, (0+i)%4);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> </span><br><span> /* Slot 2 PCI-X 133/100/66 */</span><br><span style="color: hsl(0, 100%, 40%);">- for(i = 0; i < 4; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 4; i++)</span><br><span> smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8132_1, (1 << 2)|i, m->apicid_8132_1, (1+i)%4); /* 25 */</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> j = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for(i = 1; i< sysconf.hc_possible_num; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if(!(sysconf.pci1234[i] & 0x1) ) continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 1; i < sysconf.hc_possible_num; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(sysconf.pci1234[i] & 0x1))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> int ii;</span><br><span> device_t dev;</span><br><span> struct resource *res;</span><br><span>@@ -141,9 +135,8 @@</span><br><span> res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span> if (res) {</span><br><span> /* Slot 1 PCI-X 133/100/66 */</span><br><span style="color: hsl(0, 100%, 40%);">- for(ii = 0; ii < 4; ii++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (ii = 0; ii < 4; ii++)</span><br><span> smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8132a[j][1], (0 << 2)|ii, m->apicid_8132a[j][0], (0+ii)%4);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -152,9 +145,8 @@</span><br><span> res = find_resource(dev, PCI_BASE_ADDRESS_0);</span><br><span> if (res) {</span><br><span> /* Slot 2 PCI-X 133/100/66 */</span><br><span style="color: hsl(0, 100%, 40%);">- for(ii = 0; ii < 4; ii++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (ii = 0; ii < 4; ii++)</span><br><span> smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8132a[j][2], (0 << 2)|ii, m->apicid_8132a[j][1], (0+ii)%4); /* 25 */</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23538">change 23538</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23538"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I380368873e0508c3a55ac1c4ea0de172e675cf3a </div>
<div style="display:none"> Gerrit-Change-Number: 23538 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>