src: Remove unneeded whitespace

Change-Id: I6c77f4289b46646872731ef9c20dc115f0cf876d
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/29161
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Elyes HAOUAS 2018-10-17 10:56:26 +02:00 committed by Patrick Georgi
parent 9856892297
commit a342f3937e
164 changed files with 508 additions and 480 deletions

View File

@ -453,7 +453,7 @@ static void acpigen_write_field_name(const char *name, uint32_t size)
* FIELDLIST_OFFSET(0x84), * FIELDLIST_OFFSET(0x84),
* FIELDLIST_NAMESTR("PMCS", 2), * FIELDLIST_NAMESTR("PMCS", 2),
* }; * };
* acpigen_write_field("UART", l ,ARRAY_SIZE(l), FIELD_ANYACC | FIELD_NOLOCK | * acpigen_write_field("UART", l, ARRAY_SIZE(l), FIELD_ANYACC | FIELD_NOLOCK |
* FIELD_PRESERVE); * FIELD_PRESERVE);
* Output: * Output:
* Field (UART, AnyAcc, NoLock, Preserve) * Field (UART, AnyAcc, NoLock, Preserve)

View File

@ -130,7 +130,7 @@ uint64_t storage_block_fill_write(struct storage_media *media, uint64_t start,
uint32_t *buffer = malloc(buffer_bytes); uint32_t *buffer = malloc(buffer_bytes);
uint32_t *ptr = buffer; uint32_t *ptr = buffer;
for ( ; buffer_words ; buffer_words--) for (; buffer_words ; buffer_words--)
*ptr++ = fill_pattern; *ptr++ = fill_pattern;
uint64_t todo = count; uint64_t todo = count;

View File

@ -682,7 +682,7 @@ static void waitCurrentPstate(u32 target_pstate) {
do { // should we just go on instead ? do { // should we just go on instead ?
pstate_msr = rdmsr(PS_STS_REG); pstate_msr = rdmsr(PS_STS_REG);
} while ( pstate_msr.lo != target_pstate ); } while (pstate_msr.lo != target_pstate);
} }
} }

View File

@ -226,7 +226,7 @@ void amd_generate_powernow(u32 pcontrol_blk, u8 plen, u8 onlyBSP)
fam10h_rev_e = 1; fam10h_rev_e = 1;
/* /*
* Based on the CPU socket type,cmp_cap and pwr_lmt , get the power limit. * Based on the CPU socket type, cmp_cap and pwr_lmt, get the power limit.
* socket_type : 0x10 SocketF; 0x11 AM2/ASB1; 0x12 S1G1 * socket_type : 0x10 SocketF; 0x11 AM2/ASB1; 0x12 S1G1
* cmp_cap : 0x0 SingleCore; 0x1 DualCore; 0x2 TripleCore; 0x3 QuadCore; 0x4 QuintupleCore; 0x5 HexCore * cmp_cap : 0x0 SingleCore; 0x1 DualCore; 0x2 TripleCore; 0x3 QuadCore; 0x4 QuintupleCore; 0x5 HexCore
*/ */

View File

@ -129,7 +129,7 @@ static void apply_microcode_patch(const struct microcode *m)
msr = rdmsr(0x8b); msr = rdmsr(0x8b);
new_patch_id = msr.lo; new_patch_id = msr.lo;
UCODE_DEBUG("updated to patch id = 0x%08x %s\n", new_patch_id , UCODE_DEBUG("updated to patch id = 0x%08x %s\n", new_patch_id,
(new_patch_id == m->patch_id) ? "success" : "fail"); (new_patch_id == m->patch_id) ? "success" : "fail");
} }

View File

@ -71,7 +71,7 @@ static void nano_set_max_fid_vid(void)
printk(BIOS_INFO, "Voltage ID : %dx (min %dx; max %dx)\n", printk(BIOS_INFO, "Voltage ID : %dx (min %dx; max %dx)\n",
cur_vid, min_vid, max_vid); cur_vid, min_vid, max_vid);
if ( (cur_fid != max_fid) || (cur_vid != max_vid) ) { if ((cur_fid != max_fid) || (cur_vid != max_vid)) {
/* Set highest frequency and VID */ /* Set highest frequency and VID */
msr.lo = msr.hi; msr.lo = msr.hi;
msr.hi = 0; msr.hi = 0;
@ -101,7 +101,7 @@ static void nano_power(void)
* This MSR is not documented by VIA docs, other than setting these * This MSR is not documented by VIA docs, other than setting these
* bits */ * bits */
msr = rdmsr(NANO_MYSTERIOUS_MSR); msr = rdmsr(NANO_MYSTERIOUS_MSR);
msr.lo |= ( (1 << 7) | (1 << 4) ); msr.lo |= ((1 << 7) | (1 << 4));
/* FIXME: Do we have a 6-bit or 7-bit VRM? /* FIXME: Do we have a 6-bit or 7-bit VRM?
* set bit [5] for 7-bit, or don't set it for 6 bit VRM * set bit [5] for 7-bit, or don't set it for 6 bit VRM
* This will probably require a Kconfig option * This will probably require a Kconfig option
@ -114,15 +114,15 @@ static void nano_power(void)
/* Enable TM3 */ /* Enable TM3 */
msr = rdmsr(IA32_MISC_ENABLE); msr = rdmsr(IA32_MISC_ENABLE);
msr.lo |= ( (1 << 3) | (1 << 13) ); msr.lo |= ((1 << 3) | (1 << 13));
wrmsr(IA32_MISC_ENABLE, msr); wrmsr(IA32_MISC_ENABLE, msr);
u8 stepping = ( cpuid_eax(0x1) ) &0xf; u8 stepping = (cpuid_eax(0x1)) & 0xf;
if (stepping >= MODEL_NANO_3000_B0) { if (stepping >= MODEL_NANO_3000_B0) {
/* Hello Nano 3000. The Terminator needs a CPU upgrade */ /* Hello Nano 3000. The Terminator needs a CPU upgrade */
/* Enable C1e, C2e, C3e, and C4e states */ /* Enable C1e, C2e, C3e, and C4e states */
msr = rdmsr(IA32_MISC_ENABLE); msr = rdmsr(IA32_MISC_ENABLE);
msr.lo |= ( (1 << 25) | (1 << 26) | (1 << 31)); /* C1e, C2e, C3e */ msr.lo |= ((1 << 25) | (1 << 26) | (1 << 31)); /* C1e, C2e, C3e */
msr.hi |= (1 << 0); /* C4e */ msr.hi |= (1 << 0); /* C4e */
wrmsr(IA32_MISC_ENABLE, msr); wrmsr(IA32_MISC_ENABLE, msr);
} }

View File

@ -43,9 +43,9 @@ static ucode_update_status nano_apply_ucode(const nano_ucode_header *ucode)
static void nano_print_ucode_info(const nano_ucode_header *ucode) static void nano_print_ucode_info(const nano_ucode_header *ucode)
{ {
printk(BIOS_SPEW, "Microcode update information:\n"); printk(BIOS_SPEW, "Microcode update information:\n");
printk(BIOS_SPEW, "Name: %8s\n", ucode->name ); printk(BIOS_SPEW, "Name: %8s\n", ucode->name);
printk(BIOS_SPEW, "Date: %u/%u/%u\n", ucode->month, printk(BIOS_SPEW, "Date: %u/%u/%u\n", ucode->month,
ucode->day, ucode->year ); ucode->day, ucode->year);
} }
static ucode_validity nano_ucode_is_valid(const nano_ucode_header *ucode) static ucode_validity nano_ucode_is_valid(const nano_ucode_header *ucode)
@ -54,7 +54,7 @@ static ucode_validity nano_ucode_is_valid(const nano_ucode_header *ucode)
if (ucode->signature != NANO_UCODE_SIGNATURE) if (ucode->signature != NANO_UCODE_SIGNATURE)
return NANO_UCODE_SIGNATURE_ERROR; return NANO_UCODE_SIGNATURE_ERROR;
/* The size of the head must be exactly 12 double words */ /* The size of the head must be exactly 12 double words */
if ( (ucode->total_size - ucode->payload_size) != NANO_UCODE_HEADER_SIZE) if ((ucode->total_size - ucode->payload_size) != NANO_UCODE_HEADER_SIZE)
return NANO_UCODE_WRONG_SIZE; return NANO_UCODE_WRONG_SIZE;
/* How about a checksum ? Checksum must be 0 /* How about a checksum ? Checksum must be 0
@ -119,7 +119,7 @@ unsigned int nano_update_ucode(void)
/* We might do a lot of loops searching for the microcode updates, but /* We might do a lot of loops searching for the microcode updates, but
* keep in mind, nano_ucode_is_valid searches for the signature before * keep in mind, nano_ucode_is_valid searches for the signature before
* doing anything else. */ * doing anything else. */
for ( i = 0; i < (ucode_len >> 2); /* don't increment i here */ ) for (i = 0; i < (ucode_len >> 2); /* don't increment i here */)
{ {
ucode_update_status stat; ucode_update_status stat;
const nano_ucode_header * ucode = (void *)(&ucode_data[i]); const nano_ucode_header * ucode = (void *)(&ucode_data[i]);

View File

@ -123,7 +123,7 @@ static struct device *__alloc_dev(struct bus *parent, struct device_path *path)
struct device *dev, *child; struct device *dev, *child;
/* Find the last child of our parent. */ /* Find the last child of our parent. */
for (child = parent->children; child && child->sibling; /* */ ) for (child = parent->children; child && child->sibling; /* */)
child = child->sibling; child = child->sibling;
dev = malloc(sizeof(*dev)); dev = malloc(sizeof(*dev));

View File

@ -61,7 +61,7 @@ static struct device *ht_scan_get_devs(struct device **old_devices)
/* Now add the device to the list of devices on the bus. */ /* Now add the device to the list of devices on the bus. */
/* Find the last child of our parent. */ /* Find the last child of our parent. */
for (child = first->bus->children; child && child->sibling; ) for (child = first->bus->children; child && child->sibling;)
child = child->sibling; child = child->sibling;
/* Place the chain on the list of children of their parent. */ /* Place the chain on the list of children of their parent. */

View File

@ -275,7 +275,7 @@ static void pciexp_L1_substate_commit(struct device *root, struct device *dev,
pci_update_config32(root, root_cap + 0x08, ~0xff00, pci_update_config32(root, root_cap + 0x08, ~0xff00,
(comm_mode_rst_time << 8)); (comm_mode_rst_time << 8));
pci_update_config32(root, root_cap + 0x0c , 0xffffff04, pci_update_config32(root, root_cap + 0x0c, 0xffffff04,
(endp_power_on_value << 3) | (power_on_scale)); (endp_power_on_value << 3) | (power_on_scale));
/* TODO: 0xa0, 2 are values that work on some chipsets but really /* TODO: 0xa0, 2 are values that work on some chipsets but really
@ -291,7 +291,7 @@ static void pciexp_L1_substate_commit(struct device *root, struct device *dev,
L1SubStateSupport); L1SubStateSupport);
for (dev_t = dev; dev_t; dev_t = dev_t->sibling) { for (dev_t = dev; dev_t; dev_t = dev_t->sibling) {
pci_update_config32(dev_t, end_cap + 0x0c , 0xffffff04, pci_update_config32(dev_t, end_cap + 0x0c, 0xffffff04,
(endp_power_on_value << 3) | (power_on_scale)); (endp_power_on_value << 3) | (power_on_scale));
pci_update_config32(dev_t, end_cap + 0x08, pci_update_config32(dev_t, end_cap + 0x08,

View File

@ -99,7 +99,7 @@ static void bochs_init_linear_fb(struct device *dev)
return; return;
printk(BIOS_DEBUG, "QEMU VGA: bochs dispi interface found, " printk(BIOS_DEBUG, "QEMU VGA: bochs dispi interface found, "
"%d MiB video memory\n", mem / ( 1024 * 1024)); "%d MiB video memory\n", mem / (1024 * 1024));
printk(BIOS_DEBUG, "QEMU VGA: framebuffer @ %x (pci bar %d)\n", printk(BIOS_DEBUG, "QEMU VGA: framebuffer @ %x (pci bar %d)\n",
addr, bar); addr, bar);

View File

@ -33,7 +33,7 @@ void printguid(EFI_GUID *guid)
guid->Data4[0], guid->Data4[1], guid->Data4[0], guid->Data4[1],
guid->Data4[2], guid->Data4[3], guid->Data4[2], guid->Data4[3],
guid->Data4[4], guid->Data4[5], guid->Data4[4], guid->Data4[5],
guid->Data4[6], guid->Data4[7] ); guid->Data4[6], guid->Data4[7]);
} }
void print_hob_mem_attributes(void *Hobptr) void print_hob_mem_attributes(void *Hobptr)

View File

@ -139,7 +139,7 @@ struct hob_resource *find_resource_hob_by_guid(const struct hob_header *hob,
{ {
const struct hob_resource *res; const struct hob_resource *res;
for ( ; hob->type != HOB_TYPE_END_OF_HOB_LIST; for (; hob->type != HOB_TYPE_END_OF_HOB_LIST;
hob = fsp_next_hob(hob)) { hob = fsp_next_hob(hob)) {
if (hob->type != HOB_TYPE_RESOURCE_DESCRIPTOR) if (hob->type != HOB_TYPE_RESOURCE_DESCRIPTOR)
@ -202,7 +202,7 @@ const void *fsp_find_extension_hob_by_guid(const uint8_t *guid, size_t *size)
if (!hob) if (!hob)
return NULL; return NULL;
for ( ; hob->type != HOB_TYPE_END_OF_HOB_LIST; for (; hob->type != HOB_TYPE_END_OF_HOB_LIST;
hob = fsp_next_hob(hob)) { hob = fsp_next_hob(hob)) {
if (hob->type != HOB_TYPE_GUID_EXTENSION) if (hob->type != HOB_TYPE_GUID_EXTENSION)
@ -281,7 +281,7 @@ void fsp_display_fvi_version_hob(void)
if (!hob) if (!hob)
return; return;
for ( ; hob->type != HOB_TYPE_END_OF_HOB_LIST; for (; hob->type != HOB_TYPE_END_OF_HOB_LIST;
hob = fsp_next_hob(hob)) { hob = fsp_next_hob(hob)) {
if (hob->type != HOB_TYPE_GUID_EXTENSION) if (hob->type != HOB_TYPE_GUID_EXTENSION)
continue; continue;

View File

@ -116,7 +116,7 @@ void fsp_print_memory_resource_hobs(void)
{ {
const struct hob_header *hob = fsp_get_hob_list(); const struct hob_header *hob = fsp_get_hob_list();
for ( ; hob->type != HOB_TYPE_END_OF_HOB_LIST; for (; hob->type != HOB_TYPE_END_OF_HOB_LIST;
hob = fsp_next_hob(hob)) { hob = fsp_next_hob(hob)) {
if (hob->type == HOB_TYPE_RESOURCE_DESCRIPTOR) if (hob->type == HOB_TYPE_RESOURCE_DESCRIPTOR)
fsp_print_resource_descriptor(hob); fsp_print_resource_descriptor(hob);

View File

@ -46,15 +46,15 @@ static void intel_gmbus_stop_bus(u8 *mmio, u8 bus)
wait_rdy(mmio); wait_rdy(mmio);
write32(GMBUS5_ADDR, 0); write32(GMBUS5_ADDR, 0);
write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_CYCLE_WAIT | GMBUS_CYCLE_INDEX write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_CYCLE_WAIT | GMBUS_CYCLE_INDEX
| GMBUS_CYCLE_STOP | ( 0x4 << GMBUS_BYTE_COUNT_SHIFT ) | GMBUS_CYCLE_STOP | (0x4 << GMBUS_BYTE_COUNT_SHIFT)
| GMBUS_SLAVE_READ | (AT24_ADDR << 1) ); | GMBUS_SLAVE_READ | (AT24_ADDR << 1));
wait_rdy(mmio); wait_rdy(mmio);
write32(GMBUS5_ADDR, 0); write32(GMBUS5_ADDR, 0);
write32(GMBUS1_ADDR, GMBUS_SW_CLR_INT); write32(GMBUS1_ADDR, GMBUS_SW_CLR_INT);
write32(GMBUS1_ADDR, 0); write32(GMBUS1_ADDR, 0);
wait_rdy(mmio); wait_rdy(mmio);
write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_CYCLE_STOP | GMBUS_SLAVE_WRITE write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_CYCLE_STOP | GMBUS_SLAVE_WRITE
| (AT24_ADDR << 1) ); | (AT24_ADDR << 1));
wait_rdy(mmio); wait_rdy(mmio);
write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_CYCLE_STOP); write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_CYCLE_STOP);
write32(GMBUS2_ADDR, GMBUS_INUSE); write32(GMBUS2_ADDR, GMBUS_INUSE);
@ -80,13 +80,13 @@ void intel_gmbus_read_edid(u8 *mmio, u8 bus, u8 slave, u8 *edid, u32 edid_size)
/* Ensure index bits are disabled. */ /* Ensure index bits are disabled. */
write32(GMBUS5_ADDR, 0); write32(GMBUS5_ADDR, 0);
write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_CYCLE_WAIT | GMBUS_CYCLE_INDEX write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_CYCLE_WAIT | GMBUS_CYCLE_INDEX
| (slave << 1) ); | (slave << 1));
wait_rdy(mmio); wait_rdy(mmio);
/* Ensure index bits are disabled. */ /* Ensure index bits are disabled. */
write32(GMBUS5_ADDR, 0); write32(GMBUS5_ADDR, 0);
write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_SLAVE_READ | GMBUS_CYCLE_WAIT write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_SLAVE_READ | GMBUS_CYCLE_WAIT
| GMBUS_CYCLE_STOP | GMBUS_CYCLE_STOP
| (edid_size << GMBUS_BYTE_COUNT_SHIFT) | (slave << 1) ); | (edid_size << GMBUS_BYTE_COUNT_SHIFT) | (slave << 1));
for (i = 0; i < edid_size / 4; i++) { for (i = 0; i < edid_size / 4; i++) {
u32 reg32; u32 reg32;
wait_rdy(mmio); wait_rdy(mmio);
@ -99,9 +99,9 @@ void intel_gmbus_read_edid(u8 *mmio, u8 bus, u8 slave, u8 *edid, u32 edid_size)
wait_rdy(mmio); wait_rdy(mmio);
write32(GMBUS1_ADDR, GMBUS_SW_RDY write32(GMBUS1_ADDR, GMBUS_SW_RDY
| GMBUS_SLAVE_WRITE | GMBUS_CYCLE_WAIT | GMBUS_CYCLE_STOP | GMBUS_SLAVE_WRITE | GMBUS_CYCLE_WAIT | GMBUS_CYCLE_STOP
| (128 << GMBUS_BYTE_COUNT_SHIFT) | (slave << 1) ); | (128 << GMBUS_BYTE_COUNT_SHIFT) | (slave << 1));
wait_rdy(mmio); wait_rdy(mmio);
write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_CYCLE_STOP ); write32(GMBUS1_ADDR, GMBUS_SW_RDY | GMBUS_CYCLE_STOP);
write32(GMBUS2_ADDR, GMBUS_INUSE); write32(GMBUS2_ADDR, GMBUS_INUSE);
printk (BIOS_SPEW, "EDID:\n"); printk (BIOS_SPEW, "EDID:\n");

View File

@ -173,7 +173,7 @@ static void emit_sar_acpi_structures(void)
acpigen_write_package(2); acpigen_write_package(2);
acpigen_write_dword(wgds->version); acpigen_write_dword(wgds->version);
/* Emit 'Domain Type' + /* Emit 'Domain Type' +
* Group specific delta of power ( 6 bytes * NUM_WGDS_SAR_GROUPS ) * Group specific delta of power (6 bytes * NUM_WGDS_SAR_GROUPS)
*/ */
package_size = sizeof(sar_limits.wgds.group) + 1; package_size = sizeof(sar_limits.wgds.group) + 1;
acpigen_write_package(package_size); acpigen_write_package(package_size);

View File

@ -287,7 +287,7 @@ int ne2k_init(unsigned int eth_nic_base) {
if (dev == PCI_DEV_INVALID) if (dev == PCI_DEV_INVALID)
return 0; return 0;
pci_write_config32(dev, 0x10, eth_nic_base | 1 ); pci_write_config32(dev, 0x10, eth_nic_base | 1);
pci_write_config8(dev, 0x4, 0x1); pci_write_config8(dev, 0x4, 0x1);
c = inb(eth_nic_base + NE_ASIC_OFFSET + NE_RESET); c = inb(eth_nic_base + NE_ASIC_OFFSET + NE_RESET);

View File

@ -46,7 +46,7 @@
#define TPM_DEBUG(fmt, args...) \ #define TPM_DEBUG(fmt, args...) \
if (IS_ENABLED(CONFIG_DEBUG_TPM)) { \ if (IS_ENABLED(CONFIG_DEBUG_TPM)) { \
printk(BIOS_DEBUG, PREFIX); \ printk(BIOS_DEBUG, PREFIX); \
printk(BIOS_DEBUG, fmt , ##args); \ printk(BIOS_DEBUG, fmt, ##args); \
} }
#define TPM_DEBUG_IO_READ(reg_, val_) \ #define TPM_DEBUG_IO_READ(reg_, val_) \
TPM_DEBUG("Read reg 0x%x returns 0x%x\n", (reg_), (val_)) TPM_DEBUG("Read reg 0x%x returns 0x%x\n", (reg_), (val_))

View File

@ -29,7 +29,7 @@
* uint8_t value[value_sz] * uint8_t value[value_sz]
* uint8_t active * uint8_t active
* align to 4 bytes * align to 4 bytes
* )* * )*
* uint32le_t endmarker = 0xffffffff * uint32le_t endmarker = 0xffffffff
* *
* active needs to be set to 0x00 for the entry to be valid. This satisfies * active needs to be set to 0x00 for the entry to be valid. This satisfies

View File

@ -55,7 +55,7 @@ void flashconsole_init(void)
* the sector is already erased, so we would need to read * the sector is already erased, so we would need to read
* anyways to check if it's all 0xff). * anyways to check if it's all 0xff).
*/ */
for (i = 0; i < len && offset < size; ) { for (i = 0; i < len && offset < size;) {
// Fill the buffer on first iteration // Fill the buffer on first iteration
if (i == 0) { if (i == 0) {
len = min(READ_BUFFER_SIZE, size - offset); len = min(READ_BUFFER_SIZE, size - offset);

View File

@ -2799,7 +2799,7 @@ static void XGI_SetCRT2Offset(unsigned short ModeNo,
static void XGI_SetCRT2FIFO(struct vb_device_info *pVBInfo) static void XGI_SetCRT2FIFO(struct vb_device_info *pVBInfo)
{ {
/* threshold high ,disable auto threshold */ /* threshold high, disable auto threshold */
xgifb_reg_set(pVBInfo->Part1Port, 0x01, 0x3B); xgifb_reg_set(pVBInfo->Part1Port, 0x01, 0x3B);
/* threshold low default 04h */ /* threshold low default 04h */
xgifb_reg_and_or(pVBInfo->Part1Port, 0x02, ~(0x3F), 0x04); xgifb_reg_and_or(pVBInfo->Part1Port, 0x02, ~(0x3F), 0x04);

View File

@ -155,7 +155,7 @@ detailed_cvt_descriptor(unsigned char *x, int first)
printk(BIOS_SPEW, " (broken)\n"); printk(BIOS_SPEW, " (broken)\n");
} else { } else {
printk(BIOS_SPEW, printk(BIOS_SPEW,
" %dx%d @ ( %s%s%s%s%s) Hz (%s%s preferred)\n", " %dx%d @ (%s%s%s%s%s) Hz (%s%s preferred)\n",
width, height, width, height,
fifty ? "50 " : "", fifty ? "50 " : "",
sixty ? "60 " : "", sixty ? "60 " : "",

View File

@ -1,5 +1,5 @@
/* /*
This software and ancillary information (herein called SOFTWARE ) This software and ancillary information (herein called SOFTWARE)
called LinuxBIOS is made available under the terms described called LinuxBIOS is made available under the terms described
here. The SOFTWARE has been approved for release with associated here. The SOFTWARE has been approved for release with associated
LA-CC Number 00-34 . Unless otherwise indicated, this SOFTWARE has LA-CC Number 00-34 . Unless otherwise indicated, this SOFTWARE has

View File

@ -142,7 +142,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -159,7 +159,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -111,7 +111,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -125,7 +125,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -111,7 +111,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -49,7 +49,7 @@ unsigned long acpi_fill_madt(unsigned long current)
res = find_resource(dev, PCI_BASE_ADDRESS_0); res = find_resource(dev, PCI_BASE_ADDRESS_0);
if (res) { if (res) {
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132_1, current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132_1,
res->base, gsi_base ); res->base, gsi_base);
gsi_base+=7; gsi_base+=7;
} }
} }
@ -58,7 +58,7 @@ unsigned long acpi_fill_madt(unsigned long current)
res = find_resource(dev, PCI_BASE_ADDRESS_0); res = find_resource(dev, PCI_BASE_ADDRESS_0);
if (res) { if (res) {
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132_2, current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132_2,
res->base, gsi_base ); res->base, gsi_base);
gsi_base+=7; gsi_base+=7;
} }
} }
@ -66,9 +66,10 @@ unsigned long acpi_fill_madt(unsigned long current)
int i; int i;
int j = 0; int j = 0;
for(i = 1; i < sysconf.hc_possible_num; i++) { for (i = 1; i < sysconf.hc_possible_num; i++) {
u32 d = 0; u32 d = 0;
if(!(sysconf.pci1234[i] & 0x1) ) continue; if (!(sysconf.pci1234[i] & 0x1))
continue;
/* 8131 need to use +4 */ /* 8131 need to use +4 */
switch (sysconf.hcid[i]) { switch (sysconf.hcid[i]) {
case 1: case 1:
@ -86,7 +87,7 @@ unsigned long acpi_fill_madt(unsigned long current)
res = find_resource(dev, PCI_BASE_ADDRESS_0); res = find_resource(dev, PCI_BASE_ADDRESS_0);
if (res) { if (res) {
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132a[j][0], current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132a[j][0],
res->base, gsi_base ); res->base, gsi_base);
gsi_base+=d; gsi_base+=d;
} }
} }
@ -95,7 +96,7 @@ unsigned long acpi_fill_madt(unsigned long current)
res = find_resource(dev, PCI_BASE_ADDRESS_0); res = find_resource(dev, PCI_BASE_ADDRESS_0);
if (res) { if (res) {
current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132a[j][1], current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, m->apicid_8132a[j][1],
res->base, gsi_base ); res->base, gsi_base);
gsi_base+=d; gsi_base+=d;
} }
} }
@ -105,7 +106,7 @@ unsigned long acpi_fill_madt(unsigned long current)
} }
} }
current += acpi_create_madt_irqoverride( (acpi_madt_irqoverride_t *) current, 0, 0, 2, 5 ); current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *) current, 0, 0, 2, 5);
/* 0: mean bus 0--->ISA */ /* 0: mean bus 0--->ISA */
/* 0: PIC 0 */ /* 0: PIC 0 */
/* 2: APIC 2 */ /* 2: APIC 2 */
@ -135,11 +136,12 @@ unsigned long mainboard_write_acpi_tables(struct device *device,
* change HCIN, and recalculate the checknum and add_table * change HCIN, and recalculate the checknum and add_table
*/ */
for(i = 1; i < sysconf.hc_possible_num; i++) { /* 0: is hc sblink */ for (i = 1; i < sysconf.hc_possible_num; i++) { /* 0: is hc sblink */
const char *file_name; const char *file_name;
if((sysconf.pci1234[i] & 1) != 1 ) continue; if ((sysconf.pci1234[i] & 1) != 1)
continue;
u8 c; u8 c;
if(i < 7) { if (i < 7) {
c = (u8) ('4' + i - 1); c = (u8) ('4' + i - 1);
} }
else { else {

View File

@ -95,7 +95,7 @@ void get_bus_conf(void)
int i, j; int i, j;
struct mb_sysconf_t *m; struct mb_sysconf_t *m;
if(get_bus_conf_done == 1) if (get_bus_conf_done == 1)
return; /* do it only once */ return; /* do it only once */
get_bus_conf_done = 1; get_bus_conf_done = 1;
@ -105,7 +105,7 @@ void get_bus_conf(void)
m = sysconf.mb; m = sysconf.mb;
sysconf.hc_possible_num = ARRAY_SIZE(pci1234x); sysconf.hc_possible_num = ARRAY_SIZE(pci1234x);
for(i = 0; i < sysconf.hc_possible_num; i++) { for (i = 0; i < sysconf.hc_possible_num; i++) {
sysconf.pci1234[i] = pci1234x[i]; sysconf.pci1234[i] = pci1234x[i];
sysconf.hcdn[i] = hcdnx[i]; sysconf.hcdn[i] = hcdnx[i];
} }
@ -144,8 +144,9 @@ void get_bus_conf(void)
/* HT chain 1 */ /* HT chain 1 */
j = 0; j = 0;
for(i = 1; i< sysconf.hc_possible_num; i++) { for (i = 1; i < sysconf.hc_possible_num; i++) {
if(!(sysconf.pci1234[i] & 0x1) ) continue; if (!(sysconf.pci1234[i] & 0x1))
continue;
/* check hcid type here */ /* check hcid type here */
sysconf.hcid[i] = get_hcid(i); sysconf.hcid[i] = get_hcid(i);
@ -201,7 +202,7 @@ void get_bus_conf(void)
m->apicid_8111 = apicid_base + 0; m->apicid_8111 = apicid_base + 0;
m->apicid_8132_1 = apicid_base + 1; m->apicid_8132_1 = apicid_base + 1;
m->apicid_8132_2 = apicid_base + 2; m->apicid_8132_2 = apicid_base + 2;
for(i = 0; i < j; i++) { for (i = 0; i < j; i++) {
m->apicid_8132a[i][0] = apicid_base + 3 + i * 2; m->apicid_8132a[i][0] = apicid_base + 3 + i * 2;
m->apicid_8132a[i][1] = apicid_base + 3 + i * 2 + 1; m->apicid_8132a[i][1] = apicid_base + 3 + i * 2 + 1;
} }

View File

@ -67,8 +67,9 @@ static void *smp_write_config_table(void *v)
j = 0; j = 0;
for(i = 1; i< sysconf.hc_possible_num; i++) { for (i = 1; i < sysconf.hc_possible_num; i++) {
if(!(sysconf.pci1234[i] & 0x1) ) continue; if (!(sysconf.pci1234[i] & 0x1))
continue;
switch(sysconf.hcid[i]) { switch(sysconf.hcid[i]) {
case 1: case 1:
@ -106,32 +107,33 @@ static void *smp_write_config_table(void *v)
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); 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);
/* Slot 3 PCI 32 */ /* Slot 3 PCI 32 */
for(i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
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 */ 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 */
} }
/* Slot 4 PCI 32 */ /* Slot 4 PCI 32 */
for(i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
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 */ 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 */
} }
/* Slot 1 PCI-X 133/100/66 */ /* Slot 1 PCI-X 133/100/66 */
for(i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
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); 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);
} }
/* Slot 2 PCI-X 133/100/66 */ /* Slot 2 PCI-X 133/100/66 */
for(i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
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 */ 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 */
} }
j = 0; j = 0;
for(i = 1; i< sysconf.hc_possible_num; i++) { for (i = 1; i < sysconf.hc_possible_num; i++) {
if(!(sysconf.pci1234[i] & 0x1) ) continue; if (!(sysconf.pci1234[i] & 0x1))
continue;
int ii; int ii;
int jj; int jj;
struct device *dev; struct device *dev;
@ -143,9 +145,9 @@ static void *smp_write_config_table(void *v)
if (dev) { if (dev) {
res = find_resource(dev, PCI_BASE_ADDRESS_0); res = find_resource(dev, PCI_BASE_ADDRESS_0);
if (res) { if (res) {
for(jj = 0; jj < 4; jj++) { for (jj = 0; jj < 4; jj++) {
/* Slot 1 PCI-X 133/100/66 */ /* Slot 1 PCI-X 133/100/66 */
for(ii = 0; ii < 4; ii++) { for (ii = 0; ii < 4; ii++) {
smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8132a[j][1], (jj << 2)|ii, m->apicid_8132a[j][0], (jj+ii)%4); smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8132a[j][1], (jj << 2)|ii, m->apicid_8132a[j][0], (jj+ii)%4);
} }
} }
@ -156,9 +158,9 @@ static void *smp_write_config_table(void *v)
if (dev) { if (dev) {
res = find_resource(dev, PCI_BASE_ADDRESS_0); res = find_resource(dev, PCI_BASE_ADDRESS_0);
if (res) { if (res) {
for(jj = 0; jj < 4; jj++) { for (jj = 0; jj < 4; jj++) {
/* Slot 2 PCI-X 133/100/66 */ /* Slot 2 PCI-X 133/100/66 */
for(ii = 0; ii < 4; ii++) { for (ii = 0; ii < 4; ii++) {
smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8132a[j][2], (jj << 2)|ii, m->apicid_8132a[j][1], (jj+ii)%4); /* 25 */ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, m->bus_8132a[j][2], (jj << 2)|ii, m->apicid_8132a[j][1], (jj+ii)%4); /* 25 */
} }
} }

View File

@ -111,7 +111,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -149,7 +149,7 @@ static void set_gpio40_gfx(void)
dword &= ~(1 << 10); dword &= ~(1 << 10);
/* When the gpio40 is configured as GPIO, this will represent the output value*/ /* When the gpio40 is configured as GPIO, this will represent the output value*/
/* 1 :enable two x8 , 0 : master slot enable only */ /* 1: enable two x8, 0: master slot enable only */
dword |= (1 << 26); dword |= (1 << 26);
pci_write_config32(sm_dev, 0xfc, dword); pci_write_config32(sm_dev, 0xfc, dword);
@ -161,7 +161,7 @@ static void set_gpio40_gfx(void)
dword &= ~(1 << 10); dword &= ~(1 << 10);
/* When the gpio40 is configured as GPIO, this will represent the output value*/ /* When the gpio40 is configured as GPIO, this will represent the output value*/
/* 1 :enable two x8 , 0 : master slot enable only */ /* 1: enable two x8, 0: master slot enable only */
dword &= ~(1 << 26); dword &= ~(1 << 26);
pci_write_config32(sm_dev, 0xfc, dword); pci_write_config32(sm_dev, 0xfc, dword);
} }
@ -187,7 +187,7 @@ static void set_thermal_config(void)
byte = ADT7461_read_byte(0x02); /* read status register to clear it */ byte = ADT7461_read_byte(0x02); /* read status register to clear it */
ARA_read_byte(0x05); /* A hardware alert can only be cleared by the master sending an ARA as a read command */ ARA_read_byte(0x05); /* A hardware alert can only be cleared by the master sending an ARA as a read command */
printk(BIOS_INFO, "Init adt7461 end , status 0x02 %02x\n", byte); printk(BIOS_INFO, "Init adt7461 end, status 0x02 %02x\n", byte);
/* sb700 settings for thermal config */ /* sb700 settings for thermal config */
/* set SB700 GPIO 64 to GPIO with pull-up */ /* set SB700 GPIO 64 to GPIO with pull-up */

View File

@ -91,7 +91,7 @@ void gpioEarlyInit(void) {
Mmio8_And_Or (GpioMmioAddr, Index, 0xA3, gpio_table[Index].value); Mmio8_And_Or (GpioMmioAddr, Index, 0xA3, gpio_table[Index].value);
} }
if (Index == GPIO_65) { if (Index == GPIO_65) {
if ( BoardType == 0 ) { if (BoardType == 0) {
Mmio8_And_Or (IoMuxMmioAddr, GPIO_65, 0x00, 3); // function 3 Mmio8_And_Or (IoMuxMmioAddr, GPIO_65, 0x00, 3); // function 3
} }
} }

View File

@ -125,7 +125,7 @@ void board_FCH_InitEnv(struct sysinfo *cb_NA, FCH_DATA_BLOCK *FchParams_env)
/* Read SATA controller mode from CMOS */ /* Read SATA controller mode from CMOS */
enum cb_err ret; enum cb_err ret;
ret = get_option(&FchParams_env->Sata.SataClass, "sata_mode"); ret = get_option(&FchParams_env->Sata.SataClass, "sata_mode");
if ( ret != CB_SUCCESS) { if (ret != CB_SUCCESS) {
FchParams_env->Sata.SataClass = 0; FchParams_env->Sata.SataClass = 0;
printk(BIOS_DEBUG, "ERROR: cannot read CMOS setting, falling back to default. Error code: %x\n", (int)ret); printk(BIOS_DEBUG, "ERROR: cannot read CMOS setting, falling back to default. Error code: %x\n", (int)ret);
} }

View File

@ -133,7 +133,7 @@ static void set_thermal_config(void)
byte = ADT7461_read_byte(0x02); /* read status register to clear it */ byte = ADT7461_read_byte(0x02); /* read status register to clear it */
ARA_read_byte(0x05); /* A hardware alert can only be cleared by the master sending an ARA as a read command */ ARA_read_byte(0x05); /* A hardware alert can only be cleared by the master sending an ARA as a read command */
printk(BIOS_INFO, "Init adt7461 end , status 0x02 %02x\n", byte); printk(BIOS_INFO, "Init adt7461 end, status 0x02 %02x\n", byte);
/* sb700 settings for thermal config */ /* sb700 settings for thermal config */
/* set SB700 GPIO 64 to GPIO with pull-up */ /* set SB700 GPIO 64 to GPIO with pull-up */
@ -172,7 +172,7 @@ static void set_thermal_config(void)
* pm_iowrite(0x55, byte); * pm_iowrite(0x55, byte);
* *
* byte = pm_ioread(0x67); * byte = pm_ioread(0x67);
* byte &= ~( 1 << 6); * byte &= ~(1 << 6);
* pm_iowrite(0x67, byte); * pm_iowrite(0x67, byte);
*/ */
} }

View File

@ -114,7 +114,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -127,7 +127,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -111,7 +111,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -59,37 +59,37 @@ static void ite_exit_conf(pnp_devfn_t dev)
static void ite_evc_conf(pnp_devfn_t dev) static void ite_evc_conf(pnp_devfn_t dev)
{ {
ite_enter_conf(dev); ite_enter_conf(dev);
it_sio_write(dev, 0xf1 , 0x40 ); it_sio_write(dev, 0xf1, 0x40);
it_sio_write(dev, 0xf4 , 0x80 ); it_sio_write(dev, 0xf4, 0x80);
it_sio_write(dev, 0xf5 , 0x00 ); it_sio_write(dev, 0xf5, 0x00);
it_sio_write(dev, 0xf6 , 0xf0 ); it_sio_write(dev, 0xf6, 0xf0);
it_sio_write(dev, 0xf9 , 0x48 ); it_sio_write(dev, 0xf9, 0x48);
it_sio_write(dev, 0xfa , 0x00 ); it_sio_write(dev, 0xfa, 0x00);
it_sio_write(dev, 0xfb , 0x00 ); it_sio_write(dev, 0xfb, 0x00);
ite_exit_conf(dev); ite_exit_conf(dev);
} }
static void ite_gpio_conf(pnp_devfn_t dev) static void ite_gpio_conf(pnp_devfn_t dev)
{ {
ite_enter_conf (dev); ite_enter_conf (dev);
it_sio_write (dev, 0x25 , 0x80 ); it_sio_write(dev, 0x25, 0x80);
it_sio_write (dev, 0x26 , 0x07 ); it_sio_write(dev, 0x26, 0x07);
it_sio_write (dev, 0x28 , 0x81 ); it_sio_write(dev, 0x28, 0x81);
it_sio_write (dev, 0x2c , 0x06 ); it_sio_write(dev, 0x2c, 0x06);
it_sio_write (dev, 0x72 , 0x00 ); it_sio_write(dev, 0x72, 0x00);
it_sio_write (dev, 0x73 , 0x00 ); it_sio_write(dev, 0x73, 0x00);
it_sio_write (dev, 0xb3 , 0x01 ); it_sio_write(dev, 0xb3, 0x01);
it_sio_write (dev, 0xb8 , 0x00 ); it_sio_write(dev, 0xb8, 0x00);
it_sio_write (dev, 0xc0 , 0x00 ); it_sio_write(dev, 0xc0, 0x00);
it_sio_write (dev, 0xc3 , 0x00 ); it_sio_write(dev, 0xc3, 0x00);
it_sio_write (dev, 0xc8 , 0x00 ); it_sio_write(dev, 0xc8, 0x00);
it_sio_write (dev, 0xc9 , 0x07 ); it_sio_write(dev, 0xc9, 0x07);
it_sio_write (dev, 0xcb , 0x01 ); it_sio_write(dev, 0xcb, 0x01);
it_sio_write (dev, 0xf0 , 0x10 ); it_sio_write(dev, 0xf0, 0x10);
it_sio_write (dev, 0xf4 , 0x27 ); it_sio_write(dev, 0xf4, 0x27);
it_sio_write (dev, 0xf8 , 0x20 ); it_sio_write(dev, 0xf8, 0x20);
it_sio_write (dev, 0xf9 , 0x01 ); it_sio_write(dev, 0xf9, 0x01);
ite_exit_conf (dev); ite_exit_conf(dev);
} }
void board_BeforeAgesa(struct sysinfo *cb) void board_BeforeAgesa(struct sysinfo *cb)

View File

@ -57,7 +57,7 @@ void late_mainboard_romstage_entry()
read_ssus_gpio(27), read_ssus_gpio(27),
read_ssus_gpio(28), read_ssus_gpio(28),
read_ssus_gpio(29), read_ssus_gpio(29),
read_ssus_gpio(30) ); read_ssus_gpio(30));
} }

View File

@ -226,7 +226,7 @@ static void set_thermal_config(void)
* pm_iowrite(0x55, byte); * pm_iowrite(0x55, byte);
* *
* byte = pm_ioread(0x67); * byte = pm_ioread(0x67);
* byte &= ~( 1 << 6); * byte &= ~(1 << 6);
* pm_iowrite(0x67, byte); * pm_iowrite(0x67, byte);
*/ */
} }

View File

@ -123,7 +123,7 @@ static CONST PSO_ENTRY ROMDATA PlatformMemoryTable[] = {
#define WLSEED 0x08 #define WLSEED 0x08
#define RXSEED 0x40 #define RXSEED 0x40
WRITE_LEVELING_SEED(ANY_SOCKET, ANY_CHANNEL, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED), WRITE_LEVELING_SEED(ANY_SOCKET, ANY_CHANNEL, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED),
HW_RXEN_SEED( ANY_SOCKET, ANY_CHANNEL, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED), HW_RXEN_SEED(ANY_SOCKET, ANY_CHANNEL, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED),
PSO_END PSO_END
}; };

View File

@ -111,7 +111,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -66,7 +66,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
GPIO_NC, /* 78 SDMMC3_PWR_EN_B */ GPIO_NC, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -127,9 +127,9 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
/* 76 GPI SATA_GP1 */ /* 76 GPI SATA_GP1 */
GPIO_INPUT_PU_20K, /* 77 SATA_LEDN */ GPIO_INPUT_PU_20K, /* 77 SATA_LEDN */
GPIO_NC, /* 80 SATA_GP3 */ GPIO_NC, /* 80 SATA_GP3 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
Native_M1, /* 90 PCIE_CLKREQ0B */ Native_M1, /* 90 PCIE_CLKREQ0B */
@ -156,7 +156,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -66,13 +66,13 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
Native_M1, /* 80 USB_OC0_B */ Native_M1, /* 80 USB_OC0_B */
GPI(trig_edge_both, L1, P_20K_H, non_maskable, GPI(trig_edge_both, L1, P_20K_H, non_maskable,
en_edge_detect, NA , NA), en_edge_detect, NA, NA),
/* 81 SDMMC3_CD_B */ /* 81 SDMMC3_CD_B */
GPIO_NC, /* 82 spkr assumed gpio number */ GPIO_NC, /* 82 spkr assumed gpio number */
Native_M1, /* 83 SUSPWRDNACK */ Native_M1, /* 83 SUSPWRDNACK */
@ -132,7 +132,7 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
GPIO_NC, /* 78 SATA_GP2 */ GPIO_NC, /* 78 SATA_GP2 */
GPIO_NC, /* 79 MF_SMB_ALERTB */ GPIO_NC, /* 79 MF_SMB_ALERTB */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
GPIO_NC, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ GPIO_NC, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
GPIO_NC, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ GPIO_NC, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
Native_M1, /* 90 PCIE_CLKREQ0B */ Native_M1, /* 90 PCIE_CLKREQ0B */
@ -159,7 +159,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -66,7 +66,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -130,7 +130,7 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
GPIO_NC, /* 78 HSIC AUX1 / SV Mode/ SATA_GP2 */ GPIO_NC, /* 78 HSIC AUX1 / SV Mode/ SATA_GP2 */
Native_M1, /* 79 MF_SMB_ALERTB */ Native_M1, /* 79 MF_SMB_ALERTB */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
Native_M1, /* 90 PCIE_CLKREQ0B */ Native_M1, /* 90 PCIE_CLKREQ0B */
@ -159,7 +159,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -66,7 +66,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -129,7 +129,7 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
GPIO_NC, /* 78 SATA_GP2 */ GPIO_NC, /* 78 SATA_GP2 */
Native_M1, /* 79 MF_SMB_ALERTB */ Native_M1, /* 79 MF_SMB_ALERTB */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
GPIO_INPUT_PU_20K, /* 90 PCIE_CLKREQ0B */ GPIO_INPUT_PU_20K, /* 90 PCIE_CLKREQ0B */
@ -156,7 +156,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -67,7 +67,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -129,7 +129,7 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
GPIO_NC, /* 78 SATA_GP2 */ GPIO_NC, /* 78 SATA_GP2 */
Native_M1, /* 79 MF_SMB_ALERTB */ Native_M1, /* 79 MF_SMB_ALERTB */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
GPIO_NC, /* 90 PCIE_CLKREQ0B */ GPIO_NC, /* 90 PCIE_CLKREQ0B */
@ -156,7 +156,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -66,7 +66,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -129,9 +129,9 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
/* 76 GPI SATA_GP1 */ /* 76 GPI SATA_GP1 */
GPIO_INPUT_PU_20K, /* 77 SATA_LEDN-> EC_IN_RW */ GPIO_INPUT_PU_20K, /* 77 SATA_LEDN-> EC_IN_RW */
GPIO_NC, /* 80 SATA_GP3 */ GPIO_NC, /* 80 SATA_GP3 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
Native_M1, /* 90 PCIE_CLKREQ0B */ Native_M1, /* 90 PCIE_CLKREQ0B */
@ -158,7 +158,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -67,7 +67,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -130,9 +130,9 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
/* 76 GPI SATA_GP1 */ /* 76 GPI SATA_GP1 */
GPIO_INPUT_PU_20K, /* 77 SATA_LEDN */ GPIO_INPUT_PU_20K, /* 77 SATA_LEDN */
GPIO_NC, /* 80 SATA_GP3 */ GPIO_NC, /* 80 SATA_GP3 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
Native_M1, /* 90 PCIE_CLKREQ0B */ Native_M1, /* 90 PCIE_CLKREQ0B */
@ -159,7 +159,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -67,7 +67,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -128,9 +128,9 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
/* 76 GPI SATA_GP1 */ /* 76 GPI SATA_GP1 */
GPIO_INPUT_PU_20K, /* 77 SATA_LEDN */ GPIO_INPUT_PU_20K, /* 77 SATA_LEDN */
GPIO_NC, /* 78 SATA_GP2 */ GPIO_NC, /* 78 SATA_GP2 */
Native_M1, /* 79 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 79 NFC_DEV_WAKE, MF_SMB_CLK */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID3 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID3 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
GPIO_NC, /* 90 PCIE_CLKREQ0B */ GPIO_NC, /* 90 PCIE_CLKREQ0B */
@ -157,7 +157,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -66,7 +66,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -128,7 +128,7 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
GPIO_NC, /* 78 SATA_GP2 */ GPIO_NC, /* 78 SATA_GP2 */
GPIO_NC, /* 79 MF_SMB_ALERTB */ GPIO_NC, /* 79 MF_SMB_ALERTB */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
Native_M1, /* 90 PCIE_CLKREQ0B */ Native_M1, /* 90 PCIE_CLKREQ0B */
@ -155,7 +155,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -66,7 +66,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -129,9 +129,9 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
/* 76 GPI SATA_GP1 */ /* 76 GPI SATA_GP1 */
GPIO_INPUT_PU_20K, /* 77 SATA_LEDN-> EC_IN_RW */ GPIO_INPUT_PU_20K, /* 77 SATA_LEDN-> EC_IN_RW */
GPIO_NC, /* 80 SATA_GP3 */ GPIO_NC, /* 80 SATA_GP3 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
Native_M1, /* 90 PCIE_CLKREQ0B */ Native_M1, /* 90 PCIE_CLKREQ0B */
@ -158,7 +158,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -66,7 +66,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -128,9 +128,9 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
GPIO_NC, /* 76 GPI SATA_GP1 */ GPIO_NC, /* 76 GPI SATA_GP1 */
GPIO_INPUT_PU_20K, /* 77 SATA_LEDN */ GPIO_INPUT_PU_20K, /* 77 SATA_LEDN */
GPIO_NC, /* 78 SATA_GP2 */ GPIO_NC, /* 78 SATA_GP2 */
Native_M1, /* 79 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 79 NFC_DEV_WAKE, MF_SMB_CLK */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
GPIO_NC, /* 90 PCIE_CLKREQ0B */ GPIO_NC, /* 90 PCIE_CLKREQ0B */
@ -157,7 +157,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -27,7 +27,7 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
FSP_M_CONFIG *mem_cfg = &mupd->FspmConfig; FSP_M_CONFIG *mem_cfg = &mupd->FspmConfig;
/* DQ byte map */ /* DQ byte map */
const u8 dq_map[2][12] = { const u8 dq_map[2][12] = {
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0 , { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 }, 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 },
{ 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC, { 0x33, 0xCC, 0x00, 0xCC, 0x33, 0xCC,
0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } }; 0x33, 0x00, 0xFF, 0x00, 0xFF, 0x00 } };

View File

@ -33,9 +33,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
/* DQ byte map */ /* DQ byte map */
const u8 dq_map[2][12] = { const u8 dq_map[2][12] = {
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0 , { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 }, 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 },
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0 , { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 } }; 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 } };
/* DQS CPU<>DRAM map */ /* DQS CPU<>DRAM map */
const u8 dqs_map[2][8] = { const u8 dqs_map[2][8] = {

View File

@ -65,7 +65,7 @@ static uint32_t get_index(uint32_t channel, int *cached_id)
} }
} }
die("Read impossible value ( > 1023) from 10-bit ADC!"); die("Read impossible value (> 1023) from 10-bit ADC!");
} }
uint32_t board_id(void) uint32_t board_id(void)

View File

@ -295,7 +295,7 @@ int i915lightup_sandy(const struct i915_gpu_controller_info *info,
index = run(index); index = run(index);
auxout[0] = 1 << 31 /* dp */|0x0 << 28/*W*/|DP_LINK_BW_SET << 8|0x8; auxout[0] = 1 << 31 /* dp */|0x0 << 28/*W*/|DP_LINK_BW_SET << 8|0x8;
auxout[1] = 0x0a840000; auxout[1] = 0x0a840000;
/*( DP_LINK_BW_2_7 &0xa)|0x0000840a*/ /*(DP_LINK_BW_2_7 &0xa)|0x0000840a*/
auxout[2] = 0x00000000; auxout[2] = 0x00000000;
auxout[3] = 0x01000000; auxout[3] = 0x01000000;
intel_dp_aux_ch(DPA_AUX_CH_CTL, DPA_AUX_CH_DATA1, auxout, 13, auxin, 0); intel_dp_aux_ch(DPA_AUX_CH_CTL, DPA_AUX_CH_DATA1, auxout, 13, auxin, 0);

View File

@ -112,7 +112,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -365,9 +365,9 @@ GPIO_CONTROL pavilion_m6_1035dx_gpio[] = {
#define SCI_MAP_PWRBTN 0x73 #define SCI_MAP_PWRBTN 0x73
SCI_MAP_CONTROL m6_1035dx_sci_map[] = { SCI_MAP_CONTROL m6_1035dx_sci_map[] = {
{GEVENT_PIN( EC_SCI_GEVENT ), EC_SCI_GPE}, {GEVENT_PIN(EC_SCI_GEVENT), EC_SCI_GPE},
{GEVENT_PIN( EC_LID_GEVENT ), EC_LID_GPE}, {GEVENT_PIN(EC_LID_GEVENT), EC_LID_GPE},
{GEVENT_PIN( PCIE_GEVENT ), PCIE_GPE}, {GEVENT_PIN(PCIE_GEVENT), PCIE_GPE},
{SCI_MAP_OHCI_12_0, PME_GPE}, {SCI_MAP_OHCI_12_0, PME_GPE},
{SCI_MAP_OHCI_13_0, PME_GPE}, {SCI_MAP_OHCI_13_0, PME_GPE},
{SCI_MAP_XHCI_10_0, PME_GPE}, {SCI_MAP_XHCI_10_0, PME_GPE},

View File

@ -65,67 +65,67 @@ const uint32_t mAzaliaVerbTableData13[] = {
/* /*
*ALC262 Verb Table - 10EC0262 *ALC262 Verb Table - 10EC0262
*/ */
/* Pin Complex (NID 0x11 ) */ /* Pin Complex (NID 0x11) */
0x01171CF0, 0x01171CF0,
0x01171D11, 0x01171D11,
0x01171E11, 0x01171E11,
0x01171F41, 0x01171F41,
/* Pin Complex (NID 0x12 ) */ /* Pin Complex (NID 0x12) */
0x01271CF0, 0x01271CF0,
0x01271D11, 0x01271D11,
0x01271E11, 0x01271E11,
0x01271F41, 0x01271F41,
/* Pin Complex (NID 0x14 ) */ /* Pin Complex (NID 0x14) */
0x01471C10, 0x01471C10,
0x01471D40, 0x01471D40,
0x01471E01, 0x01471E01,
0x01471F01, 0x01471F01,
/* Pin Complex (NID 0x15 ) */ /* Pin Complex (NID 0x15) */
0x01571CF0, 0x01571CF0,
0x01571D11, 0x01571D11,
0x01571E11, 0x01571E11,
0x01571F41, 0x01571F41,
/* Pin Complex (NID 0x16 ) */ /* Pin Complex (NID 0x16) */
0x01671CF0, 0x01671CF0,
0x01671D11, 0x01671D11,
0x01671E11, 0x01671E11,
0x01671F41, 0x01671F41,
/* Pin Complex (NID 0x18 ) */ /* Pin Complex (NID 0x18) */
0x01871C20, 0x01871C20,
0x01871D98, 0x01871D98,
0x01871EA1, 0x01871EA1,
0x01871F01, 0x01871F01,
/* Pin Complex (NID 0x19 ) */ /* Pin Complex (NID 0x19) */
0x01971C21, 0x01971C21,
0x01971D98, 0x01971D98,
0x01971EA1, 0x01971EA1,
0x01971F02, 0x01971F02,
/* Pin Complex (NID 0x1A ) */ /* Pin Complex (NID 0x1A) */
0x01A71C2F, 0x01A71C2F,
0x01A71D30, 0x01A71D30,
0x01A71E81, 0x01A71E81,
0x01A71F01, 0x01A71F01,
/* Pin Complex (NID 0x1B ) */ /* Pin Complex (NID 0x1B) */
0x01B71C1F, 0x01B71C1F,
0x01B71D40, 0x01B71D40,
0x01B71E21, 0x01B71E21,
0x01B71F02, 0x01B71F02,
/* Pin Complex (NID 0x1C ) */ /* Pin Complex (NID 0x1C) */
0x01C71CF0, 0x01C71CF0,
0x01C71D11, 0x01C71D11,
0x01C71E11, 0x01C71E11,
0x01C71F41, 0x01C71F41,
/* Pin Complex (NID 0x1D ) */ /* Pin Complex (NID 0x1D) */
0x01D71C01, 0x01D71C01,
0x01D71DC6, 0x01D71DC6,
0x01D71E14, 0x01D71E14,
0x01D71F40, 0x01D71F40,
/* Pin Complex (NID 0x1E ) */ /* Pin Complex (NID 0x1E) */
0x01E71CF0, 0x01E71CF0,
0x01E71D11, 0x01E71D11,
0x01E71E11, 0x01E71E11,
0x01E71F41, 0x01E71F41,
/* Pin Complex (NID 0x1F ) */ /* Pin Complex (NID 0x1F) */
0x01F71CF0, 0x01F71CF0,
0x01F71D11, 0x01F71D11,
0x01F71E11, 0x01F71E11,

View File

@ -23,7 +23,7 @@ void mainboard_fill_dq_map_ch0(void *dq_map_ptr)
{ {
/* DQ byte map Ch0 */ /* DQ byte map Ch0 */
const u8 dq_map[12] = { const u8 dq_map[12] = {
0x0F, 0xF0, 0x0F, 0xF0, 0xFF, 0x00 , 0x0F, 0xF0, 0x0F, 0xF0, 0xFF, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
memcpy(dq_map_ptr, dq_map, sizeof(dq_map)); memcpy(dq_map_ptr, dq_map, sizeof(dq_map));

View File

@ -261,7 +261,7 @@ void romstage_main_continue(EFI_STATUS status, VOID *HobListPtr) {
/* For reference print FSP version */ /* For reference print FSP version */
u32 version = MCHBAR32(0x5034); u32 version = MCHBAR32(0x5034);
printk(BIOS_DEBUG, "FSP Version %d.%d.%d Build %d\n", printk(BIOS_DEBUG, "FSP Version %d.%d.%d Build %d\n",
version >> 24 , (version >> 16) & 0xff, version >> 24, (version >> 16) & 0xff,
(version >> 8) & 0xff, version & 0xff); (version >> 8) & 0xff, version & 0xff);
printk(BIOS_DEBUG, "FSP Status: 0x%0x\n", (u32)status); printk(BIOS_DEBUG, "FSP Status: 0x%0x\n", (u32)status);

View File

@ -26,9 +26,9 @@ void mainboard_fill_dq_map_data(void *dq_map_ptr)
{ {
/* DQ byte map */ /* DQ byte map */
const u8 dq_map[2][12] = { const u8 dq_map[2][12] = {
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0 , { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 }, 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 },
{ 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0 , { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 } }; 0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 } };
memcpy(dq_map_ptr, dq_map, sizeof(dq_map)); memcpy(dq_map_ptr, dq_map, sizeof(dq_map));
} }

View File

@ -69,7 +69,7 @@ static const struct soc_gpio_map gpse_gpio_map[] = {
GPIO_NC, /* 69 MMC1_RCLK */ GPIO_NC, /* 69 MMC1_RCLK */
Native_M1, /* 75 GPO USB_OC1_B */ Native_M1, /* 75 GPO USB_OC1_B */
Native_M1, /* 76 PMU_RESETBUTTON_B */ Native_M1, /* 76 PMU_RESETBUTTON_B */
GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA , NA), GPI(trig_edge_both, L0, NA, non_maskable, en_edge_detect, NA, NA),
/* GPIO_ALERT 77 */ /* GPIO_ALERT 77 */
Native_M1, /* 78 SDMMC3_PWR_EN_B */ Native_M1, /* 78 SDMMC3_PWR_EN_B */
GPIO_NC, /* 79 GPI ILB_SERIRQ */ GPIO_NC, /* 79 GPI ILB_SERIRQ */
@ -131,11 +131,11 @@ static const struct soc_gpio_map gpsw_gpio_map[] = {
GPIO_OUT_HIGH, /* 75 SATA_GP0 */ GPIO_OUT_HIGH, /* 75 SATA_GP0 */
GPIO_NC, GPIO_NC,
/* 76 GPI SATA_GP1 */ /* 76 GPI SATA_GP1 */
GPIO_INPUT_PU_20K, /* 77 SATA_LEDN , EC_IN_RW */ GPIO_INPUT_PU_20K, /* 77 SATA_LEDN, EC_IN_RW */
GPIO_NC, /* 80 SATA_GP3 */ GPIO_NC, /* 80 SATA_GP3 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */ GPIO_INPUT_NO_PULL, /* 80 SATA_GP3,RAMID0 */
Native_M1, /* 81 NFC_DEV_WAKE , MF_SMB_CLK */ Native_M1, /* 81 NFC_DEV_WAKE, MF_SMB_CLK */
Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */ Native_M1, /* 82 NFC_FW_DOWNLOAD, MF_SMB_DATA */
/* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */ /* Per DE request, change PCIE_CLKREQ0123B to GPIO_INPUT */
Native_M1, /* 90 PCIE_CLKREQ0B */ Native_M1, /* 90 PCIE_CLKREQ0B */
@ -162,7 +162,7 @@ static const struct soc_gpio_map gpn_gpio_map[] = {
GPIO_NC, /* 06 GPIO_DFX8 */ GPIO_NC, /* 06 GPIO_DFX8 */
GPIO_NC, /* 07 GPIO_DFX2 */ GPIO_NC, /* 07 GPIO_DFX2 */
GPIO_NC, /* 08 GPIO_DFX6 */ GPIO_NC, /* 08 GPIO_DFX6 */
GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data , GPI(trig_edge_low, L8, NA, non_maskable, en_edge_rx_data,
UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */ UNMASK_WAKE, SCI), /* 15 GPIO_SUS0 */
GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */ GPO_FUNC(NA, NA), /* 16 SEC_GPIO_SUS10 */
GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA), GPI(trig_edge_low, L0, P_1K_H, non_maskable, NA, NA, NA),

View File

@ -112,7 +112,7 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
FchParams->Imc.ImcEnable = TRUE; FchParams->Imc.ImcEnable = TRUE;
FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */ FchParams->Hwm.HwmControl = 1; /* 1 IMC, 0 HWM */
FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC , 1 enable IMC, 0 following hw strap setting */ FchParams->Imc.ImcEnableOverWrite = 1; /* 2 disable IMC, 1 enable IMC, 0 following hw strap setting */
LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader); LibAmdMemFill(&(FchParams->Imc.EcStruct), 0, sizeof(FCH_EC), FchParams->StdHeader);

View File

@ -365,9 +365,9 @@ GPIO_CONTROL lenovo_g505s_gpio[] = {
#define SCI_MAP_PWRBTN 0x73 #define SCI_MAP_PWRBTN 0x73
SCI_MAP_CONTROL lenovo_g505s_sci_map[] = { SCI_MAP_CONTROL lenovo_g505s_sci_map[] = {
{GEVENT_PIN( EC_SCI_GEVENT ), EC_SCI_GPE}, {GEVENT_PIN(EC_SCI_GEVENT), EC_SCI_GPE},
{GEVENT_PIN( EC_LID_GEVENT ), EC_LID_GPE}, {GEVENT_PIN(EC_LID_GEVENT), EC_LID_GPE},
{GEVENT_PIN( PCIE_GEVENT ), PCIE_GPE}, {GEVENT_PIN(PCIE_GEVENT), PCIE_GPE},
{SCI_MAP_OHCI_12_0, PME_GPE}, {SCI_MAP_OHCI_12_0, PME_GPE},
{SCI_MAP_OHCI_13_0, PME_GPE}, {SCI_MAP_OHCI_13_0, PME_GPE},
{SCI_MAP_XHCI_10_0, PME_GPE}, {SCI_MAP_XHCI_10_0, PME_GPE},

View File

@ -43,7 +43,7 @@ void mainboard_rcba_config(void)
} }
const struct southbridge_usb_port mainboard_usb_ports[] = { const struct southbridge_usb_port mainboard_usb_ports[] = {
{ 1, 0, 0 }, /* P0: , OC 0 */ { 1, 0, 0 }, /* P0:, OC 0 */
{ 1, 1, 1 }, /* P1: (EHCI debug), OC 1 */ { 1, 1, 1 }, /* P1: (EHCI debug), OC 1 */
{ 1, 1, 3 }, /* P2: OC 3 */ { 1, 1, 3 }, /* P2: OC 3 */
{ 1, 0, -1 }, /* P3: no OC */ { 1, 0, -1 }, /* P3: no OC */

View File

@ -183,7 +183,7 @@ void mainboard_romstage_entry(unsigned long bist)
/* We want early GPIO setup, to be able to detect legacy I/O module */ /* We want early GPIO setup, to be able to detect legacy I/O module */
pci_write_config32(PCI_DEV(0, 0x1f, 0), GPIOBASE, DEFAULT_GPIOBASE | 1); pci_write_config32(PCI_DEV(0, 0x1f, 0), GPIOBASE, DEFAULT_GPIOBASE | 1);
/* Enable GPIOs */ /* Enable GPIOs */
pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x4c /* GC */ , 0x10); pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x4c /* GC */, 0x10);
setup_pch_gpios(&mainboard_gpio_map); setup_pch_gpios(&mainboard_gpio_map);
dock_err = dlpc_init(); dock_err = dlpc_init();

View File

@ -49,7 +49,7 @@ static void mainboard_smi_brightness_up(void)
{ {
u8 *bar; u8 *bar;
if ((bar = (u8 *)pci_read_config32(PCI_DEV(1, 0, 0), 0x18))) { if ((bar = (u8 *)pci_read_config32(PCI_DEV(1, 0, 0), 0x18))) {
printk(BIOS_DEBUG, "bar: %08X, level %02X\n", (unsigned int )bar, *(bar+LVTMA_BL_MOD_LEVEL)); printk(BIOS_DEBUG, "bar: %08X, level %02X\n", (unsigned int)bar, *(bar+LVTMA_BL_MOD_LEVEL));
*(bar+LVTMA_BL_MOD_LEVEL) |= 0x0f; *(bar+LVTMA_BL_MOD_LEVEL) |= 0x0f;
if (*(bar+LVTMA_BL_MOD_LEVEL) < 0xf0) if (*(bar+LVTMA_BL_MOD_LEVEL) < 0xf0)
*(bar+LVTMA_BL_MOD_LEVEL) += 0x10; *(bar+LVTMA_BL_MOD_LEVEL) += 0x10;

View File

@ -190,7 +190,7 @@ int dock_connect(void)
dock_gpio_set_mode(0x14, PC87392_GPIO_PIN_PULLUP, 0x00); dock_gpio_set_mode(0x14, PC87392_GPIO_PIN_PULLUP, 0x00);
dock_gpio_set_mode(0x15, PC87392_GPIO_PIN_PULLUP, 0x00); dock_gpio_set_mode(0x15, PC87392_GPIO_PIN_PULLUP, 0x00);
dock_gpio_set_mode(0x16, PC87392_GPIO_PIN_PULLUP | dock_gpio_set_mode(0x16, PC87392_GPIO_PIN_PULLUP |
PC87392_GPIO_PIN_OE , 0x00); PC87392_GPIO_PIN_OE, 0x00);
dock_gpio_set_mode(0x17, PC87392_GPIO_PIN_PULLUP, 0x00); dock_gpio_set_mode(0x17, PC87392_GPIO_PIN_PULLUP, 0x00);

View File

@ -183,7 +183,7 @@ void mainboard_romstage_entry(unsigned long bist)
/* We want early GPIO setup, to be able to detect legacy I/O module */ /* We want early GPIO setup, to be able to detect legacy I/O module */
pci_write_config32(PCI_DEV(0, 0x1f, 0), GPIOBASE, DEFAULT_GPIOBASE | 1); pci_write_config32(PCI_DEV(0, 0x1f, 0), GPIOBASE, DEFAULT_GPIOBASE | 1);
/* Enable GPIOs */ /* Enable GPIOs */
pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x4c /* GC */ , 0x10); pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x4c /* GC */, 0x10);
setup_pch_gpios(&mainboard_gpio_map); setup_pch_gpios(&mainboard_gpio_map);
dock_err = dlpc_init(); dock_err = dlpc_init();

View File

@ -50,7 +50,7 @@ static void mainboard_smi_brightness_up(void)
{ {
u8 *bar; u8 *bar;
if ((bar = (u8 *)pci_read_config32(PCI_DEV(1, 0, 0), 0x18))) { if ((bar = (u8 *)pci_read_config32(PCI_DEV(1, 0, 0), 0x18))) {
printk(BIOS_DEBUG, "bar: %08X, level %02X\n", (unsigned int )bar, printk(BIOS_DEBUG, "bar: %08X, level %02X\n", (unsigned int)bar,
*(bar+LVTMA_BL_MOD_LEVEL)); *(bar+LVTMA_BL_MOD_LEVEL));
*(bar+LVTMA_BL_MOD_LEVEL) |= 0x0f; *(bar+LVTMA_BL_MOD_LEVEL) |= 0x0f;
if (*(bar+LVTMA_BL_MOD_LEVEL) < 0xf0) if (*(bar+LVTMA_BL_MOD_LEVEL) < 0xf0)

View File

@ -65,19 +65,19 @@ static void init(struct device *dev)
/* Init Hudson GPIOs. */ /* Init Hudson GPIOs. */
printk(BIOS_DEBUG, "Init FCH GPIOs @ 0x%08x\n", ACPI_MMIO_BASE+GPIO_BASE); printk(BIOS_DEBUG, "Init FCH GPIOs @ 0x%08x\n", ACPI_MMIO_BASE+GPIO_BASE);
FCH_IOMUX( 50) = 2; // GPIO50: FCH_ARST#_GATE resets stuck PCIe devices FCH_IOMUX(50) = 2; // GPIO50: FCH_ARST#_GATE resets stuck PCIe devices
FCH_GPIO ( 50) = 0xC0; // = output set to 1 as it's never needed FCH_GPIO (50) = 0xC0; // = output set to 1 as it's never needed
FCH_IOMUX(197) = 2; // GPIO197: BIOS_DEFAULTS# = input (int. PU) FCH_IOMUX(197) = 2; // GPIO197: BIOS_DEFAULTS# = input (int. PU)
FCH_IOMUX( 56) = 1; // GPIO58-56: REV_ID2-0 FCH_IOMUX(56) = 1; // GPIO58-56: REV_ID2-0
FCH_GPIO ( 56) = 0x28; // = inputs, disable int. pull-ups FCH_GPIO (56) = 0x28; // = inputs, disable int. pull-ups
FCH_IOMUX( 57) = 1; FCH_IOMUX(57) = 1;
FCH_GPIO ( 57) = 0x28; FCH_GPIO (57) = 0x28;
FCH_IOMUX( 58) = 1; FCH_IOMUX(58) = 1;
FCH_GPIO ( 58) = 0x28; FCH_GPIO (58) = 0x28;
FCH_IOMUX( 96) = 1; // "Gpio96": GEVENT0# signal on X2 connector (int. PU) FCH_IOMUX(96) = 1; // "Gpio96": GEVENT0# signal on X2 connector (int. PU)
FCH_IOMUX( 52) = 1; // GPIO52,61,62,187-192 free to use on X2 connector FCH_IOMUX(52) = 1; // GPIO52,61,62,187-192 free to use on X2 connector
FCH_IOMUX( 61) = 2; // default to inputs with int. PU FCH_IOMUX(61) = 2; // default to inputs with int. PU
FCH_IOMUX( 62) = 2; FCH_IOMUX(62) = 2;
FCH_IOMUX(187) = 2; FCH_IOMUX(187) = 2;
FCH_IOMUX(188) = 2; FCH_IOMUX(188) = 2;
FCH_IOMUX(189) = 1; FCH_IOMUX(189) = 1;

View File

@ -33,16 +33,16 @@ static void init(struct device *dev)
/* Init Hudson GPIOs. */ /* Init Hudson GPIOs. */
printk(BIOS_DEBUG, "Init FCH GPIOs @ 0x%08x\n", ACPI_MMIO_BASE+GPIO_BASE); printk(BIOS_DEBUG, "Init FCH GPIOs @ 0x%08x\n", ACPI_MMIO_BASE+GPIO_BASE);
FCH_IOMUX( 50) = 2; // GPIO50: FCH_ARST#_GATE resets stuck PCIe devices FCH_IOMUX(50) = 2; // GPIO50: FCH_ARST#_GATE resets stuck PCIe devices
FCH_GPIO ( 50) = 0xC0; // = output set to 1 as it's never needed FCH_GPIO (50) = 0xC0; // = output set to 1 as it's never needed
FCH_IOMUX(197) = 2; // GPIO197: BIOS_DEFAULTS# FCH_IOMUX(197) = 2; // GPIO197: BIOS_DEFAULTS#
FCH_GPIO (197) = 0x28; // = input, disable int. pull-up FCH_GPIO (197) = 0x28; // = input, disable int. pull-up
FCH_IOMUX( 56) = 1; // GPIO58-56: REV_ID2-0 FCH_IOMUX(56) = 1; // GPIO58-56: REV_ID2-0
FCH_GPIO ( 56) = 0x28; // = inputs, disable int. pull-ups FCH_GPIO (56) = 0x28; // = inputs, disable int. pull-ups
FCH_IOMUX( 57) = 1; FCH_IOMUX(57) = 1;
FCH_GPIO ( 57) = 0x28; FCH_GPIO (57) = 0x28;
FCH_IOMUX( 58) = 1; FCH_IOMUX(58) = 1;
FCH_GPIO ( 58) = 0x28; FCH_GPIO (58) = 0x28;
FCH_IOMUX(187) = 2; // GPIO187,188,166,GPO160: GPO0-3 on COM Express connector FCH_IOMUX(187) = 2; // GPIO187,188,166,GPO160: GPO0-3 on COM Express connector
FCH_GPIO (187) = 0x08; // = outputs, disable PUs, default to 0 FCH_GPIO (187) = 0x08; // = outputs, disable PUs, default to 0
FCH_IOMUX(188) = 2; FCH_IOMUX(188) = 2;

View File

@ -101,12 +101,12 @@ void get_bus_conf(void)
} }
for (i = 2; i < 8; i++) { for (i = 2; i < 8; i++) {
dev = dev_find_slot(m->bus_mcp55[0], PCI_DEVFN(sysconf.sbdn + 0x0a + i - 2 , 0)); dev = dev_find_slot(m->bus_mcp55[0], PCI_DEVFN(sysconf.sbdn + 0x0a + i - 2, 0));
if (dev) { if (dev) {
m->bus_mcp55[i] = pci_read_config8(dev, PCI_SECONDARY_BUS); m->bus_mcp55[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
} }
else { else {
printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_mcp55[0], sysconf.sbdn + 0x0a + i - 2 ); printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_mcp55[0], sysconf.sbdn + 0x0a + i - 2);
} }
} }

View File

@ -87,13 +87,13 @@ static void sio_setup(void)
u32 dword; u32 dword;
u8 byte; u8 byte;
byte = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0x7b); byte = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0x7b);
byte |= 0x20; byte |= 0x20;
pci_write_config8(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0x7b, byte); pci_write_config8(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0x7b, byte);
dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0xa0); dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0xa0);
dword |= (1 << 0); dword |= (1 << 0);
pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0xa0, dword); pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0xa0, dword);
} }
static const u8 spd_addr[] = { static const u8 spd_addr[] = {

View File

@ -44,7 +44,7 @@
* 4banks (2) * 4banks (2)
* SSTL_2 (2) * SSTL_2 (2)
* 4th GEN die (C) * 4th GEN die (C)
* Normal Power Consumption (<blank> ) * Normal Power Consumption (<blank>)
* TSOP (T) * TSOP (T)
* Single Die (<blank>) * Single Die (<blank>)
* Lead Free (P) * Lead Free (P)

View File

@ -42,7 +42,7 @@
* 4banks (2) * 4banks (2)
* SSTL_2 (2) * SSTL_2 (2)
* 4th GEN die (C) * 4th GEN die (C)
* Normal Power Consumption (<blank> ) * Normal Power Consumption (<blank>)
* TSOP (T) * TSOP (T)
* Single Die (<blank>) * Single Die (<blank>)
* Lead Free (P) * Lead Free (P)

View File

@ -108,7 +108,7 @@ static CONST PSO_ENTRY ROMDATA PlatformMemoryTable[] = {
#define WLSEED 0x08 #define WLSEED 0x08
#define RXSEED 0x40 #define RXSEED 0x40
WRITE_LEVELING_SEED(ANY_SOCKET, ANY_CHANNEL, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED), WRITE_LEVELING_SEED(ANY_SOCKET, ANY_CHANNEL, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED, WLSEED),
HW_RXEN_SEED( ANY_SOCKET, ANY_CHANNEL, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED), HW_RXEN_SEED(ANY_SOCKET, ANY_CHANNEL, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED, RXSEED),
PSO_END PSO_END
}; };

View File

@ -25,9 +25,9 @@ uintptr_t find_gpio_base(void)
uintptr_t base_addr = 0; uintptr_t base_addr = 0;
/* Find the ACPImmioAddr base address */ /* Find the ACPImmioAddr base address */
for ( pm_index = 0x27; pm_index > 0x23; pm_index-- ) { for (pm_index = 0x27; pm_index > 0x23; pm_index--) {
outb( pm_index, PM_INDEX ); outb(pm_index, PM_INDEX);
pm_data = inb( PM_DATA ); pm_data = inb(PM_DATA);
base_addr <<= 8; base_addr <<= 8;
base_addr |= (u32)pm_data; base_addr |= (u32)pm_data;
} }

View File

@ -99,7 +99,7 @@ static AGESA_STATUS Fch_Oem_config(UINT32 Func, UINTN FchData, VOID *ConfigPtr)
FchParams->Usb.Ehci1Enable = TRUE; FchParams->Usb.Ehci1Enable = TRUE;
} }
// Enable EHCI 1 ( port 4 to 7) // Enable EHCI 1 (port 4 to 7)
// port 4 and 5 to EHCI header port 6 and 7 to PCIe slot. // port 4 and 5 to EHCI header port 6 and 7 to PCIe slot.
FchParams->Usb.Ehci2Enable = TRUE; FchParams->Usb.Ehci2Enable = TRUE;

View File

@ -167,12 +167,12 @@ static void mainboard_enable(struct device *dev)
// //
// Enable the RTC output // Enable the RTC output
// //
pm_write16 ( PM_RTC_CONTROL, pm_read16( PM_RTC_CONTROL ) | (1 << 11)); pm_write16(PM_RTC_CONTROL, pm_read16(PM_RTC_CONTROL) | (1 << 11));
// //
// Enable power on from WAKE# // Enable power on from WAKE#
// //
pm_write16 ( PM_S_STATE_CONTROL, pm_read16( PM_S_STATE_CONTROL ) | (1 << 14)); pm_write16(PM_S_STATE_CONTROL, pm_read16(PM_S_STATE_CONTROL) | (1 << 14));
/* Initialize the PIRQ data structures for consumption */ /* Initialize the PIRQ data structures for consumption */
pirq_setup(); pirq_setup();

View File

@ -53,7 +53,7 @@ int ptn3460_init(char *hwi_block)
hwi_block); hwi_block);
return 1; return 1;
} }
if (hwilib_get_field(PF_Color_Depth ,&color_depth, 1) != 1) { if (hwilib_get_field(PF_Color_Depth, &color_depth, 1) != 1) {
printk(BIOS_ERR, "LCD: Missing panel features from %s\n", printk(BIOS_ERR, "LCD: Missing panel features from %s\n",
hwi_block); hwi_block);
return 1; return 1;

View File

@ -66,67 +66,67 @@ const uint32_t mAzaliaVerbTableData13[] = {
/* /*
*ALC262 Verb Table - 10EC0262 *ALC262 Verb Table - 10EC0262
*/ */
/* Pin Complex (NID 0x11 ) */ /* Pin Complex (NID 0x11) */
0x01171CF0, 0x01171CF0,
0x01171D11, 0x01171D11,
0x01171E11, 0x01171E11,
0x01171F41, 0x01171F41,
/* Pin Complex (NID 0x12 ) */ /* Pin Complex (NID 0x12) */
0x01271CF0, 0x01271CF0,
0x01271D11, 0x01271D11,
0x01271E11, 0x01271E11,
0x01271F41, 0x01271F41,
/* Pin Complex (NID 0x14 ) */ /* Pin Complex (NID 0x14) */
0x01471C10, 0x01471C10,
0x01471D40, 0x01471D40,
0x01471E01, 0x01471E01,
0x01471F01, 0x01471F01,
/* Pin Complex (NID 0x15 ) */ /* Pin Complex (NID 0x15) */
0x01571CF0, 0x01571CF0,
0x01571D11, 0x01571D11,
0x01571E11, 0x01571E11,
0x01571F41, 0x01571F41,
/* Pin Complex (NID 0x16 ) */ /* Pin Complex (NID 0x16) */
0x01671CF0, 0x01671CF0,
0x01671D11, 0x01671D11,
0x01671E11, 0x01671E11,
0x01671F41, 0x01671F41,
/* Pin Complex (NID 0x18 ) */ /* Pin Complex (NID 0x18) */
0x01871C20, 0x01871C20,
0x01871D98, 0x01871D98,
0x01871EA1, 0x01871EA1,
0x01871F01, 0x01871F01,
/* Pin Complex (NID 0x19 ) */ /* Pin Complex (NID 0x19) */
0x01971C21, 0x01971C21,
0x01971D98, 0x01971D98,
0x01971EA1, 0x01971EA1,
0x01971F02, 0x01971F02,
/* Pin Complex (NID 0x1A ) */ /* Pin Complex (NID 0x1A) */
0x01A71C2F, 0x01A71C2F,
0x01A71D30, 0x01A71D30,
0x01A71E81, 0x01A71E81,
0x01A71F01, 0x01A71F01,
/* Pin Complex (NID 0x1B ) */ /* Pin Complex (NID 0x1B) */
0x01B71C1F, 0x01B71C1F,
0x01B71D40, 0x01B71D40,
0x01B71E21, 0x01B71E21,
0x01B71F02, 0x01B71F02,
/* Pin Complex (NID 0x1C ) */ /* Pin Complex (NID 0x1C) */
0x01C71CF0, 0x01C71CF0,
0x01C71D11, 0x01C71D11,
0x01C71E11, 0x01C71E11,
0x01C71F41, 0x01C71F41,
/* Pin Complex (NID 0x1D ) */ /* Pin Complex (NID 0x1D) */
0x01D71C01, 0x01D71C01,
0x01D71DC6, 0x01D71DC6,
0x01D71E14, 0x01D71E14,
0x01D71F40, 0x01D71F40,
/* Pin Complex (NID 0x1E ) */ /* Pin Complex (NID 0x1E) */
0x01E71CF0, 0x01E71CF0,
0x01E71D11, 0x01E71D11,
0x01E71E11, 0x01E71E11,
0x01E71F41, 0x01E71F41,
/* Pin Complex (NID 0x1F ) */ /* Pin Complex (NID 0x1F) */
0x01F71CF0, 0x01F71CF0,
0x01F71D11, 0x01F71D11,
0x01F71E11, 0x01F71E11,

View File

@ -99,12 +99,12 @@ void get_bus_conf(void)
} }
for(i = 2; i < 8; i++) { for(i = 2; i < 8; i++) {
dev = dev_find_slot(m->bus_mcp55[0], PCI_DEVFN(sysconf.sbdn + 0x0a + i - 2 , 0)); dev = dev_find_slot(m->bus_mcp55[0], PCI_DEVFN(sysconf.sbdn + 0x0a + i - 2, 0));
if (dev) { if (dev) {
m->bus_mcp55[i] = pci_read_config8(dev, PCI_SECONDARY_BUS); m->bus_mcp55[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
} }
else { else {
printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_mcp55[0], sysconf.sbdn + 0x0a + i - 2 ); printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_mcp55[0], sysconf.sbdn + 0x0a + i - 2);
} }
} }

View File

@ -105,12 +105,12 @@ void get_bus_conf(void)
} }
for(i = 2; i < 8; i++) { for(i = 2; i < 8; i++) {
dev = dev_find_slot(m->bus_mcp55[0], PCI_DEVFN(sysconf.sbdn + 0x0a + i - 2 , 0)); dev = dev_find_slot(m->bus_mcp55[0], PCI_DEVFN(sysconf.sbdn + 0x0a + i - 2, 0));
if (dev) { if (dev) {
m->bus_mcp55[i] = pci_read_config8(dev, PCI_SECONDARY_BUS); m->bus_mcp55[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
} }
else { else {
printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_mcp55[0], sysconf.sbdn + 0x0a + i - 2 ); printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_mcp55[0], sysconf.sbdn + 0x0a + i - 2);
} }
} }

View File

@ -89,17 +89,17 @@ static void sio_setup(void)
// smbusx_write_byte(1, (0x58 >> 1), 0, 0x80); /* select bank0 */ // smbusx_write_byte(1, (0x58 >> 1), 0, 0x80); /* select bank0 */
smbusx_write_byte(1, (0x58 >> 1), 0xb1, 0xff); /* set FAN ctrl to DC mode */ smbusx_write_byte(1, (0x58 >> 1), 0xb1, 0xff); /* set FAN ctrl to DC mode */
byte = pci_read_config8(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0x7b); byte = pci_read_config8(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0x7b);
byte |= 0x20; byte |= 0x20;
pci_write_config8(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0x7b, byte); pci_write_config8(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0x7b, byte);
dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0xa0); dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0xa0);
dword |= (1 << 0); dword |= (1 << 0);
pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0xa0, dword); pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0xa0, dword);
dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0xa4); dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0xa4);
dword |= (1 << 16); dword |= (1 << 16);
pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0xa4, dword); pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0xa4, dword);
} }
static const u8 spd_addr[] = { static const u8 spd_addr[] = {
@ -113,7 +113,7 @@ static const u8 spd_addr[] = {
/* third node */ /* third node */
RC02, DIMM0, DIMM2, 0, 0, DIMM1, DIMM3, 0, 0, RC02, DIMM0, DIMM2, 0, 0, DIMM1, DIMM3, 0, 0,
/* fourth node */ /* fourth node */
RC03, DIMM4, DIMM6,0 , 0, DIMM5, DIMM7, 0, 0, RC03, DIMM4, DIMM6, 0, 0, DIMM5, DIMM7, 0, 0,
#endif #endif
}; };

View File

@ -98,12 +98,12 @@ void get_bus_conf(void)
} }
for(i = 2; i < 8; i++) { for(i = 2; i < 8; i++) {
dev = dev_find_slot(m->bus_mcp55[0], PCI_DEVFN(sysconf.sbdn + 0x0a + i - 2 , 0)); dev = dev_find_slot(m->bus_mcp55[0], PCI_DEVFN(sysconf.sbdn + 0x0a + i - 2, 0));
if (dev) { if (dev) {
m->bus_mcp55[i] = pci_read_config8(dev, PCI_SECONDARY_BUS); m->bus_mcp55[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
} }
else { else {
printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_mcp55[0], sysconf.sbdn + 0x0a + i - 2 ); printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_mcp55[0], sysconf.sbdn + 0x0a + i - 2);
} }
} }

View File

@ -87,18 +87,18 @@ static void sio_setup(void)
uint32_t dword; uint32_t dword;
uint8_t byte; uint8_t byte;
byte = pci_read_config8(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0x7b); byte = pci_read_config8(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0x7b);
byte |= 0x20; byte |= 0x20;
pci_write_config8(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0x7b, byte); pci_write_config8(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0x7b, byte);
dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0xa0); dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0xa0);
/*serial 0 */ /*serial 0 */
dword |= (1 << 0); dword |= (1 << 0);
pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0xa0, dword); pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0xa0, dword);
dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0xa4); dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0xa4);
dword |= (1 << 16); dword |= (1 << 16);
pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+1 , 0), 0xa4, dword); pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+1, 0), 0xa4, dword);
} }
static const u8 spd_addr[] = { static const u8 spd_addr[] = {

View File

@ -55,7 +55,7 @@ AmdMemoryReadSPD (
IN UINT32 Func, IN UINT32 Func,
IN UINTN Data, IN UINTN Data,
IN OUT AGESA_READ_SPD_PARAMS *SpdData IN OUT AGESA_READ_SPD_PARAMS *SpdData
) )
{ {
UINT8 SmBusAddress = 0; UINT8 SmBusAddress = 0;
UINTN Index; UINTN Index;

View File

@ -149,7 +149,7 @@ static struct resource *amdfam14_find_iopair(struct device *dev,
/* Ext conf space */ /* Ext conf space */
if (!reg) { if (!reg) {
/* Because of Extend conf space, we will never run out of reg, /* Because of Extend conf space, we will never run out of reg,
* but we need one index to differ them. So ,same node and same * but we need one index to differ them. So,same node and same
* link can have multi range * link can have multi range
*/ */
u32 index = get_io_addr_index(nodeid, link); u32 index = get_io_addr_index(nodeid, link);
@ -185,7 +185,7 @@ static struct resource *amdfam14_find_mempair(struct device *dev, u32 nodeid,
/* Ext conf space */ /* Ext conf space */
if (!reg) { if (!reg) {
/* Because of Extend conf space, we will never run out of reg, /* Because of Extend conf space, we will never run out of reg,
* but we need one index to differ them. So ,same node and same * but we need one index to differ them. So,same node and same
* link can have multi range * link can have multi range
*/ */
u32 index = get_mmio_addr_index(nodeid, link); u32 index = get_mmio_addr_index(nodeid, link);

View File

@ -1737,7 +1737,7 @@ static void SPDSetBanks_D(struct MCTStatStruc *pMCTstat,
* and PCI 0:24N:2x60,64,68,6C config registers (CS Mask 0-3). * and PCI 0:24N:2x60,64,68,6C config registers (CS Mask 0-3).
*/ */
u8 ChipSel, Rows, Cols, Ranks ,Banks, DevWidth; u8 ChipSel, Rows, Cols, Ranks, Banks, DevWidth;
u32 BankAddrReg, csMask; u32 BankAddrReg, csMask;
u32 val; u32 val;

View File

@ -684,7 +684,7 @@ void prepareDimms(struct MCTStatStruc *pMCTstat, struct DCTStatStruc *pDCTstat,
{tempW = bitTestSet(tempW, 7);} {tempW = bitTestSet(tempW, 7);}
if (bitTest(tempW1,18)) if (bitTest(tempW1,18))
{tempW = bitTestSet(tempW, 6);} {tempW = bitTestSet(tempW, 6);}
/* tempW = tempW|(((tempW1 >> 20) & 0x7 )<< 3); */ /* tempW = tempW|(((tempW1 >> 20) & 0x7)<< 3); */
tempW = tempW|((tempW1&0x00700000) >> 17); tempW = tempW|((tempW1&0x00700000) >> 17);
/* workaround for DR-B0 */ /* workaround for DR-B0 */
if ((pDCTData->LogicalCPUID & AMD_DR_Bx) && (pDCTData->Status[DCT_STATUS_REGISTERED])) if ((pDCTData->LogicalCPUID & AMD_DR_Bx) && (pDCTData->Status[DCT_STATUS_REGISTERED]))

View File

@ -148,7 +148,8 @@ void dump_smbus_registers(void)
printk(BIOS_DEBUG, "\n"); printk(BIOS_DEBUG, "\n");
for (device = 1; device < 0x80; device++) { for (device = 1; device < 0x80; device++) {
int j; int j;
if ( spd_read_byte(device, 0) < 0 ) continue; if (spd_read_byte(device, 0) < 0)
continue;
printk(BIOS_DEBUG, "smbus: %02x", device); printk(BIOS_DEBUG, "smbus: %02x", device);
for (j = 0; j < 256; j++) { for (j = 0; j < 256; j++) {
int status; int status;

View File

@ -131,7 +131,7 @@ static void mc_add_dram_resources(struct device *dev)
mmio_resource(dev, index++, tomlow >> 10, (bmbound - bsmmrrl) >> 10); mmio_resource(dev, index++, tomlow >> 10, (bmbound - bsmmrrl) >> 10);
if (bmbound_hi > 0x100000000) { if (bmbound_hi > 0x100000000) {
ram_resource(dev, index++, 0x100000000 >> 10, (bmbound_hi - 0x100000000) >> 10 ); ram_resource(dev, index++, 0x100000000 >> 10, (bmbound_hi - 0x100000000) >> 10);
printk(BIOS_INFO, "Available memory above 4GB: %lluM\n", (bmbound_hi - 0x100000000) >> 20); printk(BIOS_INFO, "Available memory above 4GB: %lluM\n", (bmbound_hi - 0x100000000) >> 20);
} }

View File

@ -180,7 +180,7 @@ void sdram_initialize(struct pei_data *pei_data)
*/ */
u32 version = MCHBAR32(0x5034); u32 version = MCHBAR32(0x5034);
printk(BIOS_DEBUG, "System Agent Version %d.%d.%d Build %d\n", printk(BIOS_DEBUG, "System Agent Version %d.%d.%d Build %d\n",
version >> 24 , (version >> 16) & 0xff, version >> 24, (version >> 16) & 0xff,
(version >> 8) & 0xff, version & 0xff); (version >> 8) & 0xff, version & 0xff);
report_memory_config(); report_memory_config();

View File

@ -36,7 +36,7 @@ static void nehalem_setup_bars(void)
pci_write_config32(PCI_DEV(0, 0x1f, 0), PMBASE, DEFAULT_PMBASE | 1); pci_write_config32(PCI_DEV(0, 0x1f, 0), PMBASE, DEFAULT_PMBASE | 1);
/* Enable ACPI BAR */ /* Enable ACPI BAR */
pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x44 /* ACPI_CNTL */ , 0x80); pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x44 /* ACPI_CNTL */, 0x80);
printk(BIOS_DEBUG, " done.\n"); printk(BIOS_DEBUG, " done.\n");

View File

@ -1420,7 +1420,7 @@ static void program_total_memory_map(struct raminfo *info)
TOM = 4032; TOM = 4032;
TOUUD = ALIGN_DOWN(TOM - info->memory_reserved_for_heci_mb, 64); TOUUD = ALIGN_DOWN(TOM - info->memory_reserved_for_heci_mb, 64);
TOLUD = ALIGN_DOWN(min(4096 - mmio_size + ALIGN_UP(uma_size_igd + uma_size_gtt, 64) TOLUD = ALIGN_DOWN(min(4096 - mmio_size + ALIGN_UP(uma_size_igd + uma_size_gtt, 64)
, TOUUD), 64); , TOUUD), 64);
memory_remap = 0; memory_remap = 0;
if (TOUUD - TOLUD > 64) { if (TOUUD - TOLUD > 64) {
memory_remap = 1; memory_remap = 1;

Some files were not shown because too many files have changed in this diff Show More