tree: Remove blank lines before '}' and after '{'
Change-Id: I46a362270f69d0a4a28e5bb9c954f34d632815ff Signed-off-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/81455 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
		@@ -40,5 +40,4 @@ void buffer_to_fifo32_prefix(const void *buffer, u32 prefix, int prefsz, size_t
 | 
				
			|||||||
		val = 0;
 | 
							val = 0;
 | 
				
			||||||
		j = 0;
 | 
							j = 0;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1491,7 +1491,6 @@ void pci_scan_bus(struct bus *bus, unsigned int min_devfn,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	prev = &bus->children;
 | 
						prev = &bus->children;
 | 
				
			||||||
	for (dev = bus->children; dev; dev = dev->sibling) {
 | 
						for (dev = bus->children; dev; dev = dev->sibling) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		/*
 | 
							/*
 | 
				
			||||||
		 * If static device is not PCI then enable it here and don't
 | 
							 * If static device is not PCI then enable it here and don't
 | 
				
			||||||
		 * treat it as a leftover device.
 | 
							 * treat it as a leftover device.
 | 
				
			||||||
@@ -1851,7 +1850,6 @@ void pci_assign_irqs(struct device *dev, const unsigned char pIntAtoD[4])
 | 
				
			|||||||
	slot = dev->path.pci.devfn >> 3;
 | 
						slot = dev->path.pci.devfn >> 3;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (; dev ; dev = dev->sibling) {
 | 
						for (; dev ; dev = dev->sibling) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		if (dev->path.pci.devfn >> 3 != slot)
 | 
							if (dev->path.pci.devfn >> 3 != slot)
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -140,7 +140,6 @@ static void update_bridge_resource(const struct device *bridge, struct resource
 | 
				
			|||||||
	print_bridge_res(bridge, bridge_res, print_depth, "");
 | 
						print_bridge_res(bridge, bridge_res, print_depth, "");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	while ((child = largest_resource(bus, &child_res, type_mask, type_match))) {
 | 
						while ((child = largest_resource(bus, &child_res, type_mask, type_match))) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		/* Size 0 resources can be skipped. */
 | 
							/* Size 0 resources can be skipped. */
 | 
				
			||||||
		if (!child_res->size)
 | 
							if (!child_res->size)
 | 
				
			||||||
			continue;
 | 
								continue;
 | 
				
			||||||
@@ -260,7 +259,6 @@ static void compute_domain_resources(const struct device *domain)
 | 
				
			|||||||
		return;
 | 
							return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (child = domain->downstream->children; child; child = child->sibling) {
 | 
						for (child = domain->downstream->children; child; child = child->sibling) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		/* Skip if this is not a bridge or has no children under it. */
 | 
							/* Skip if this is not a bridge or has no children under it. */
 | 
				
			||||||
		if (!dev_has_children(child))
 | 
							if (!dev_has_children(child))
 | 
				
			||||||
			continue;
 | 
								continue;
 | 
				
			||||||
@@ -400,7 +398,6 @@ static void allocate_toplevel_resources(const struct device *const domain,
 | 
				
			|||||||
	setup_resource_ranges(domain, type, &ranges);
 | 
						setup_resource_ranges(domain, type, &ranges);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	while ((dev = largest_resource(domain->downstream, &res, type_mask, type))) {
 | 
						while ((dev = largest_resource(domain->downstream, &res, type_mask, type))) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		if (!res->size)
 | 
							if (!res->size)
 | 
				
			||||||
			continue;
 | 
								continue;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -557,7 +554,6 @@ void allocate_resources(const struct device *root)
 | 
				
			|||||||
		return;
 | 
							return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (child = root->downstream->children; child; child = child->sibling) {
 | 
						for (child = root->downstream->children; child; child = child->sibling) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		if (child->path.type != DEVICE_PATH_DOMAIN)
 | 
							if (child->path.type != DEVICE_PATH_DOMAIN)
 | 
				
			||||||
			continue;
 | 
								continue;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,7 +26,6 @@ static void print_guid(int log_level, const EFI_GUID *g)
 | 
				
			|||||||
	printk(log_level, "GUID: %08x-%04x-%04x-%02x%02x%02x%02x%02x%02x%02x%02x",
 | 
						printk(log_level, "GUID: %08x-%04x-%04x-%02x%02x%02x%02x%02x%02x%02x%02x",
 | 
				
			||||||
		g->Data1, g->Data2, g->Data3, g->Data4[0], g->Data4[1], g->Data4[2],
 | 
							g->Data1, g->Data2, g->Data3, g->Data4[0], g->Data4[1], g->Data4[2],
 | 
				
			||||||
		g->Data4[3], g->Data4[4], g->Data4[5], g->Data4[6], g->Data4[7]);
 | 
							g->Data4[3], g->Data4[4], g->Data4[5], g->Data4[6], g->Data4[7]);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static bool compare_guid(const EFI_GUID *a, const EFI_GUID *b)
 | 
					static bool compare_guid(const EFI_GUID *a, const EFI_GUID *b)
 | 
				
			||||||
@@ -164,7 +163,6 @@ static enum cb_err validate_fv_header(const struct region_device *rdev,
 | 
				
			|||||||
	printk(BIOS_SPEW, PREFIX "UEFI FV with size %lld found\n", fw_vol_hdr->FvLength);
 | 
						printk(BIOS_SPEW, PREFIX "UEFI FV with size %lld found\n", fw_vol_hdr->FvLength);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return CB_SUCCESS;
 | 
						return CB_SUCCESS;
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static enum cb_err
 | 
					static enum cb_err
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,7 +4,6 @@
 | 
				
			|||||||
#define __DRIVERS_I2C_PTN3460_CHIP_H__
 | 
					#define __DRIVERS_I2C_PTN3460_CHIP_H__
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct drivers_i2c_ptn3460_config {
 | 
					struct drivers_i2c_ptn3460_config {
 | 
				
			||||||
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif /* __DRIVERS_I2C_PTN3460_CHIP_H__ */
 | 
					#endif /* __DRIVERS_I2C_PTN3460_CHIP_H__ */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -446,7 +446,6 @@ static tpm_result_t cr50_i2c_probe(uint32_t *did_vid)
 | 
				
			|||||||
	printk(BIOS_INFO, "Probing TPM I2C: ");
 | 
						printk(BIOS_INFO, "Probing TPM I2C: ");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (retries = 100; retries > 0; retries--) {
 | 
						for (retries = 100; retries > 0; retries--) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		rc = cr50_i2c_read(TPM_DID_VID(0), (uint8_t *)did_vid, 4);
 | 
							rc = cr50_i2c_read(TPM_DID_VID(0), (uint8_t *)did_vid, 4);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		/* Exit once DID and VID verified */
 | 
							/* Exit once DID and VID verified */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -117,7 +117,6 @@ static int iic_tpm_read(uint8_t addr, uint8_t *buffer, size_t len)
 | 
				
			|||||||
					  buffer, len);
 | 
										  buffer, len);
 | 
				
			||||||
			if (rc == 0)
 | 
								if (rc == 0)
 | 
				
			||||||
				break;  /* success, break to skip sleep */
 | 
									break;  /* success, break to skip sleep */
 | 
				
			||||||
 | 
					 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -245,7 +245,6 @@ void print_hob_type_structure(u16 hob_type, void *hob_list_ptr)
 | 
				
			|||||||
	printk(BIOS_DEBUG, "%p: hob_list_ptr\n", hob_list_ptr);
 | 
						printk(BIOS_DEBUG, "%p: hob_list_ptr\n", hob_list_ptr);
 | 
				
			||||||
	for (current_hob = hob_list_ptr; !END_OF_HOB_LIST(current_hob);
 | 
						for (current_hob = hob_list_ptr; !END_OF_HOB_LIST(current_hob);
 | 
				
			||||||
	    current_hob = GET_NEXT_HOB(current_hob)) {
 | 
						    current_hob = GET_NEXT_HOB(current_hob)) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		EFI_HOB_GENERIC_HEADER *current_header_ptr =
 | 
							EFI_HOB_GENERIC_HEADER *current_header_ptr =
 | 
				
			||||||
			(EFI_HOB_GENERIC_HEADER *)current_hob;
 | 
								(EFI_HOB_GENERIC_HEADER *)current_hob;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -97,7 +97,6 @@ int smmstore_lookup_region(struct region_device *rstore)
 | 
				
			|||||||
	static struct region_device rdev;
 | 
						static struct region_device rdev;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (!done) {
 | 
						if (!done) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		done = 1;
 | 
							done = 1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (fmap_locate_area_as_rdev_rw(SMMSTORE_REGION, &rdev)) {
 | 
							if (fmap_locate_area_as_rdev_rw(SMMSTORE_REGION, &rdev)) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -48,7 +48,6 @@ void ec_mirror_flag(void)
 | 
				
			|||||||
	if (CONFIG(EC_STARLABS_MIRROR_SUPPORT) &&
 | 
						if (CONFIG(EC_STARLABS_MIRROR_SUPPORT) &&
 | 
				
			||||||
		(CONFIG(DRIVERS_INTEL_USB4_RETIMER) || get_uint_option("mirror_flag", 0)) &&
 | 
							(CONFIG(DRIVERS_INTEL_USB4_RETIMER) || get_uint_option("mirror_flag", 0)) &&
 | 
				
			||||||
		(ec_version != CONFIG_EC_STARLABS_MIRROR_VERSION)) {
 | 
							(ec_version != CONFIG_EC_STARLABS_MIRROR_VERSION)) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		printk(BIOS_ERR, "ITE: EC version 0x%x doesn't match coreboot version 0x%x.\n",
 | 
							printk(BIOS_ERR, "ITE: EC version 0x%x doesn't match coreboot version 0x%x.\n",
 | 
				
			||||||
			ec_version, CONFIG_EC_STARLABS_MIRROR_VERSION);
 | 
								ec_version, CONFIG_EC_STARLABS_MIRROR_VERSION);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -387,7 +387,6 @@ static void lb_strings(struct lb_header *header)
 | 
				
			|||||||
		rec->size = ALIGN_UP(sizeof(*rec) + len + 1, LB_ENTRY_ALIGN);
 | 
							rec->size = ALIGN_UP(sizeof(*rec) + len + 1, LB_ENTRY_ALIGN);
 | 
				
			||||||
		memcpy(rec->string, strings[i].string, len+1);
 | 
							memcpy(rec->string, strings[i].string, len+1);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void lb_record_version_timestamp(struct lb_header *header)
 | 
					static void lb_record_version_timestamp(struct lb_header *header)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1389,7 +1389,6 @@ int decode_edid(unsigned char *edid, int size, struct edid *out)
 | 
				
			|||||||
					out->mode_is_supported[j] = 1;
 | 
										out->mode_is_supported[j] = 1;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	printk(BIOS_SPEW, "Standard timings supported:\n");
 | 
						printk(BIOS_SPEW, "Standard timings supported:\n");
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -316,7 +316,6 @@ static struct state_tracker {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static void bs_walk_state_machine(void)
 | 
					static void bs_walk_state_machine(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	while (1) {
 | 
						while (1) {
 | 
				
			||||||
		struct boot_state *state;
 | 
							struct boot_state *state;
 | 
				
			||||||
		boot_state_t next_id;
 | 
							boot_state_t next_id;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -183,7 +183,6 @@ static void merge_add_memranges(struct memranges *ranges,
 | 
				
			|||||||
		/* The new entry starts after this one. */
 | 
							/* The new entry starts after this one. */
 | 
				
			||||||
		if (begin > cur->end)
 | 
							if (begin > cur->end)
 | 
				
			||||||
			continue;
 | 
								continue;
 | 
				
			||||||
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* Add new entry and merge with neighbors. */
 | 
						/* Add new entry and merge with neighbors. */
 | 
				
			||||||
@@ -389,7 +388,6 @@ memranges_find_entry(struct memranges *ranges, resource_t limit, resource_t size
 | 
				
			|||||||
		return NULL;
 | 
							return NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	memranges_each_entry(r, ranges) {
 | 
						memranges_each_entry(r, ranges) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		if (r->tag != tag)
 | 
							if (r->tag != tag)
 | 
				
			||||||
			continue;
 | 
								continue;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -242,7 +242,6 @@ int region_file_init(struct region_file *f, const struct region_device *p)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
int region_file_data(const struct region_file *f, struct region_device *rdev)
 | 
					int region_file_data(const struct region_file *f, struct region_device *rdev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	size_t offset;
 | 
						size_t offset;
 | 
				
			||||||
	size_t size;
 | 
						size_t size;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -57,5 +57,4 @@ int checkstack(void *top_of_stack, int core)
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return 0;
 | 
						return 0;
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Pad configuration in ramstage */
 | 
					/* Pad configuration in ramstage */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* GPIO A0-A6, A9-A10 default function is NF1 for eSPI interface when
 | 
						/* GPIO A0-A6, A9-A10 default function is NF1 for eSPI interface when
 | 
				
			||||||
	  eSPI is enabled */
 | 
						  eSPI is enabled */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,7 +3,6 @@
 | 
				
			|||||||
#include <device/azalia_device.h>
 | 
					#include <device/azalia_device.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const u32 cim_verb_data[] = {
 | 
					const u32 cim_verb_data[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
	 * VerbTable: CFL Display Audio Codec
 | 
						 * VerbTable: CFL Display Audio Codec
 | 
				
			||||||
	 * Revision ID = 0xFF
 | 
						 * Revision ID = 0xFF
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,7 +3,6 @@
 | 
				
			|||||||
#include <device/azalia_device.h>
 | 
					#include <device/azalia_device.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const u32 cim_verb_data[] = {
 | 
					const u32 cim_verb_data[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
	 * VerbTable: CFL Display Audio Codec
 | 
						 * VerbTable: CFL Display Audio Codec
 | 
				
			||||||
	 * Revision ID = 0xFF
 | 
						 * Revision ID = 0xFF
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#include <soc/romstage.h>
 | 
					#include <soc/romstage.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct mb_cfg ehlcrb_lpddr4x_memcfg_cfg = {
 | 
					static const struct mb_cfg ehlcrb_lpddr4x_memcfg_cfg = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	.dq_map[DDR_CH0] = {
 | 
						.dq_map[DDR_CH0] = {
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Pad configuration in ramstage */
 | 
					/* Pad configuration in ramstage */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* WWAN_WAKE_N */
 | 
						/* WWAN_WAKE_N */
 | 
				
			||||||
	PAD_CFG_GPI_SCI(GPP_A10, NONE, DEEP, LEVEL, INVERT),
 | 
						PAD_CFG_GPI_SCI(GPP_A10, NONE, DEEP, LEVEL, INVERT),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,6 @@
 | 
				
			|||||||
#include <soc/romstage.h>
 | 
					#include <soc/romstage.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct mb_cfg jslrvp_ddr4_memcfg_cfg = {
 | 
					static const struct mb_cfg jslrvp_ddr4_memcfg_cfg = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	.dq_map[DDR_CH0] = {
 | 
						.dq_map[DDR_CH0] = {
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
@@ -51,7 +50,6 @@ static const struct mb_cfg jslrvp_ddr4_memcfg_cfg = {
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct mb_cfg jslrvp_lpddr4_memcfg_cfg = {
 | 
					static const struct mb_cfg jslrvp_lpddr4_memcfg_cfg = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	.dq_map[DDR_CH0] = {
 | 
						.dq_map[DDR_CH0] = {
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -48,7 +48,6 @@ static void ioexpander_init(void *unused)
 | 
				
			|||||||
	/* Port 0 Configuration */
 | 
						/* Port 0 Configuration */
 | 
				
			||||||
	i2c_writeb(IO_EXPANDER_BUS, IO_EXPANDER_1_ADDR, IO_EXPANDER_P0CONF,
 | 
						i2c_writeb(IO_EXPANDER_BUS, IO_EXPANDER_1_ADDR, IO_EXPANDER_P0CONF,
 | 
				
			||||||
		0x00);
 | 
							0x00);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_EXIT, ioexpander_init, NULL);
 | 
					BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_EXIT, ioexpander_init, NULL);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#include <device/azalia_device.h>
 | 
					#include <device/azalia_device.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const u32 cim_verb_data[] = {
 | 
					const u32 cim_verb_data[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	0x8086280B,
 | 
						0x8086280B,
 | 
				
			||||||
	0x00000000,
 | 
						0x00000000,
 | 
				
			||||||
	0x00000005,
 | 
						0x00000005,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#include <device/azalia_device.h>
 | 
					#include <device/azalia_device.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const u32 cim_verb_data[] = {
 | 
					const u32 cim_verb_data[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	0x8086280B,
 | 
						0x8086280B,
 | 
				
			||||||
	0x00000000,
 | 
						0x00000000,
 | 
				
			||||||
	0x00000005,
 | 
						0x00000005,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#include <device/azalia_device.h>
 | 
					#include <device/azalia_device.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const u32 cim_verb_data[] = {
 | 
					const u32 cim_verb_data[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	0x8086280B,
 | 
						0x8086280B,
 | 
				
			||||||
	0x00000000,
 | 
						0x00000000,
 | 
				
			||||||
	0x00000005,
 | 
						0x00000005,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,7 +55,6 @@ void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr)
 | 
				
			|||||||
	} else {
 | 
						} else {
 | 
				
			||||||
		memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget));
 | 
							memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget));
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
uintptr_t mainboard_get_spd_data(void)
 | 
					uintptr_t mainboard_get_spd_data(void)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -96,6 +96,5 @@ static void fw_config_handle(void *unused)
 | 
				
			|||||||
		printk(BIOS_INFO, "Configure GPIOs for SoundWire audio (onboard codec).\n");
 | 
							printk(BIOS_INFO, "Configure GPIOs for SoundWire audio (onboard codec).\n");
 | 
				
			||||||
		gpio_configure_pads(sndw_alc711_enable_pads, ARRAY_SIZE(i2s_enable_pads));
 | 
							gpio_configure_pads(sndw_alc711_enable_pads, ARRAY_SIZE(i2s_enable_pads));
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
 | 
					BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Early pad configuration in bootblock */
 | 
					/* Early pad configuration in bootblock */
 | 
				
			||||||
static const struct pad_config early_gpio_table[] = {
 | 
					static const struct pad_config early_gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* UART0 RX */
 | 
						/* UART0 RX */
 | 
				
			||||||
	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),
 | 
						PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),
 | 
				
			||||||
	/* UART0 TX */
 | 
						/* UART0 TX */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -241,6 +241,5 @@ static struct soc_gpio_config gpio_config = {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
struct soc_gpio_config *mainboard_get_gpios(void)
 | 
					struct soc_gpio_config *mainboard_get_gpios(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	return &gpio_config;
 | 
						return &gpio_config;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -48,5 +48,4 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 | 
				
			|||||||
	bool half_populated = false;
 | 
						bool half_populated = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	memcfg_init(mupd, mem_config, &spd_info, half_populated);
 | 
						memcfg_init(mupd, mem_config, &spd_info, half_populated);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -232,6 +232,5 @@ static struct soc_gpio_config gpio_config = {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
struct soc_gpio_config *mainboard_get_gpios(void)
 | 
					struct soc_gpio_config *mainboard_get_gpios(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	return &gpio_config;
 | 
						return &gpio_config;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Pad configuration was generated automatically using intelp2m utility */
 | 
					/* Pad configuration was generated automatically using intelp2m utility */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* ------- GPIO Community 0 ------- */
 | 
						/* ------- GPIO Community 0 ------- */
 | 
				
			||||||
	/* ------- GPIO Group GPP_A ------- */
 | 
						/* ------- GPIO Group GPP_A ------- */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* PAD configuration was generated automatically using intelp2m utility */
 | 
					/* PAD configuration was generated automatically using intelp2m utility */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* ------- GPIO Community 0 ------- */
 | 
						/* ------- GPIO Community 0 ------- */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* ------- GPIO Group GPP_B ------- */
 | 
						/* ------- GPIO Group GPP_B ------- */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Pad configuration in ramstage */
 | 
					/* Pad configuration in ramstage */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Community 0 - GpioGroup GPP_B */
 | 
						/* Community 0 - GpioGroup GPP_B */
 | 
				
			||||||
	PAD_CFG_NF(GPP_B2, NONE, PLTRST, NF1),		/* PMC_VRALERT_N */
 | 
						PAD_CFG_NF(GPP_B2, NONE, PLTRST, NF1),		/* PMC_VRALERT_N */
 | 
				
			||||||
	PAD_CFG_NF(GPP_B3, NONE, PLTRST, NF4),		/* ESPI_ALERT0_N */
 | 
						PAD_CFG_NF(GPP_B3, NONE, PLTRST, NF4),		/* ESPI_ALERT0_N */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#include <soc/romstage.h>
 | 
					#include <soc/romstage.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct mb_cfg fa_ehl_lpddr4x_memcfg_cfg = {
 | 
					static const struct mb_cfg fa_ehl_lpddr4x_memcfg_cfg = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	.dq_map[DDR_CH0] = {
 | 
						.dq_map[DDR_CH0] = {
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@
 | 
				
			|||||||
   EDS vol 1, but some pins aren't grouped functionally in the table so those were moved for
 | 
					   EDS vol 1, but some pins aren't grouped functionally in the table so those were moved for
 | 
				
			||||||
   more logical grouping. */
 | 
					   more logical grouping. */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Southwest Community */
 | 
						/* Southwest Community */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* PCIE_WAKE[0:3]_N */
 | 
						/* PCIE_WAKE[0:3]_N */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@
 | 
				
			|||||||
   EDS vol 1, but some pins aren't grouped functionally in the table so those were moved for
 | 
					   EDS vol 1, but some pins aren't grouped functionally in the table so those were moved for
 | 
				
			||||||
   more logical grouping. */
 | 
					   more logical grouping. */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Southwest Community */
 | 
						/* Southwest Community */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* EXT_WAKE0_1V8# */
 | 
						/* EXT_WAKE0_1V8# */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@
 | 
				
			|||||||
   EDS vol 1, but some pins aren't grouped functionally in the table so those were moved for
 | 
					   EDS vol 1, but some pins aren't grouped functionally in the table so those were moved for
 | 
				
			||||||
   more logical grouping. */
 | 
					   more logical grouping. */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Southwest Community */
 | 
						/* Southwest Community */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* PCIE_WAKE[0:3]_N */
 | 
						/* PCIE_WAKE[0:3]_N */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@
 | 
				
			|||||||
   EDS vol 1, but some pins aren't grouped functionally in the table so those were moved for
 | 
					   EDS vol 1, but some pins aren't grouped functionally in the table so those were moved for
 | 
				
			||||||
   more logical grouping. */
 | 
					   more logical grouping. */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Southwest Community */
 | 
						/* Southwest Community */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* PCIE_WAKE[0:3]_N */
 | 
						/* PCIE_WAKE[0:3]_N */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@
 | 
				
			|||||||
   EDS vol 1, but some pins aren't grouped functionally in the table so those were moved for
 | 
					   EDS vol 1, but some pins aren't grouped functionally in the table so those were moved for
 | 
				
			||||||
   more logical grouping. */
 | 
					   more logical grouping. */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Southwest Community */
 | 
						/* Southwest Community */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* PCIE_WAKE[0:3]_N */
 | 
						/* PCIE_WAKE[0:3]_N */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#include <soc/romstage.h>
 | 
					#include <soc/romstage.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct mb_cfg mc_ehl_lpddr4x_memcfg_cfg = {
 | 
					static const struct mb_cfg mc_ehl_lpddr4x_memcfg_cfg = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	.dq_map[DDR_CH0] = {
 | 
						.dq_map[DDR_CH0] = {
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Pad configuration in ramstage */
 | 
					/* Pad configuration in ramstage */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Community 0 - GpioGroup GPP_B */
 | 
						/* Community 0 - GpioGroup GPP_B */
 | 
				
			||||||
	PAD_CFG_NF(GPP_B2, NONE, PLTRST, NF1),		/* PMC_VRALERT_N */
 | 
						PAD_CFG_NF(GPP_B2, NONE, PLTRST, NF1),		/* PMC_VRALERT_N */
 | 
				
			||||||
	PAD_CFG_NF(GPP_B3, NONE, PLTRST, NF4),		/* ESPI_ALERT0_N */
 | 
						PAD_CFG_NF(GPP_B3, NONE, PLTRST, NF4),		/* ESPI_ALERT0_N */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#include <soc/romstage.h>
 | 
					#include <soc/romstage.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct mb_cfg mc_ehl_lpddr4x_memcfg_cfg = {
 | 
					static const struct mb_cfg mc_ehl_lpddr4x_memcfg_cfg = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	.dq_map[DDR_CH0] = {
 | 
						.dq_map[DDR_CH0] = {
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Pad configuration in ramstage */
 | 
					/* Pad configuration in ramstage */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Community 0 - GpioGroup GPP_B */
 | 
						/* Community 0 - GpioGroup GPP_B */
 | 
				
			||||||
	PAD_CFG_NF(GPP_B2, NONE, PLTRST, NF1),		/* PMC_VRALERT_N */
 | 
						PAD_CFG_NF(GPP_B2, NONE, PLTRST, NF1),		/* PMC_VRALERT_N */
 | 
				
			||||||
	PAD_CFG_NF(GPP_B3, NONE, PLTRST, NF4),		/* ESPI_ALERT0_N */
 | 
						PAD_CFG_NF(GPP_B3, NONE, PLTRST, NF4),		/* ESPI_ALERT0_N */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#include <soc/romstage.h>
 | 
					#include <soc/romstage.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct mb_cfg mc_ehl_lpddr4x_memcfg_cfg = {
 | 
					static const struct mb_cfg mc_ehl_lpddr4x_memcfg_cfg = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	.dq_map[DDR_CH0] = {
 | 
						.dq_map[DDR_CH0] = {
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#include <soc/romstage.h>
 | 
					#include <soc/romstage.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct mb_cfg mc_ehl_lpddr4x_memcfg_cfg = {
 | 
					static const struct mb_cfg mc_ehl_lpddr4x_memcfg_cfg = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	.dq_map[DDR_CH0] = {
 | 
						.dq_map[DDR_CH0] = {
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Pad configuration in ramstage */
 | 
					/* Pad configuration in ramstage */
 | 
				
			||||||
static const struct pad_config gpio_table[] = {
 | 
					static const struct pad_config gpio_table[] = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Community 0 - GpioGroup GPP_B */
 | 
						/* Community 0 - GpioGroup GPP_B */
 | 
				
			||||||
	PAD_CFG_NF(GPP_B2, NONE, PLTRST, NF1),		/* PMC_VRALERT_N */
 | 
						PAD_CFG_NF(GPP_B2, NONE, PLTRST, NF1),		/* PMC_VRALERT_N */
 | 
				
			||||||
	PAD_CFG_NF(GPP_B3, NONE, PLTRST, NF4),		/* ESPI_ALERT0_N */
 | 
						PAD_CFG_NF(GPP_B3, NONE, PLTRST, NF4),		/* ESPI_ALERT0_N */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#include <soc/romstage.h>
 | 
					#include <soc/romstage.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct mb_cfg mc_ehl_lpddr4x_memcfg_cfg = {
 | 
					static const struct mb_cfg mc_ehl_lpddr4x_memcfg_cfg = {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	.dq_map[DDR_CH0] = {
 | 
						.dq_map[DDR_CH0] = {
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
		{0xf, 0xf0},
 | 
							{0xf, 0xf0},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -241,7 +241,6 @@ static void add_ivhd_device_entries(struct device *parent, struct device *dev,
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (dev->path.type == DEVICE_PATH_PCI) {
 | 
						if (dev->path.type == DEVICE_PATH_PCI) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		if ((dev->upstream->secondary == 0x0) &&
 | 
							if ((dev->upstream->secondary == 0x0) &&
 | 
				
			||||||
		    (dev->path.pci.devfn == 0x0))
 | 
							    (dev->path.pci.devfn == 0x0))
 | 
				
			||||||
			*root_level = depth;
 | 
								*root_level = depth;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -340,7 +340,6 @@ static struct dimm_size sdram_spd_get_page_size(uint16_t dimm_socket_address)
 | 
				
			|||||||
	if (value > 2)
 | 
						if (value > 2)
 | 
				
			||||||
		die("Bad SPD value\n");
 | 
							die("Bad SPD value\n");
 | 
				
			||||||
	if (value == 2) {
 | 
						if (value == 2) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		pgsz.side2 = pgsz.side1;	// Assume symmetric banks until we know differently
 | 
							pgsz.side2 = pgsz.side1;	// Assume symmetric banks until we know differently
 | 
				
			||||||
		value = smbus_read_byte(dimm_socket_address, SPD_NUM_COLUMNS);
 | 
							value = smbus_read_byte(dimm_socket_address, SPD_NUM_COLUMNS);
 | 
				
			||||||
		if (value < 0)
 | 
							if (value < 0)
 | 
				
			||||||
@@ -413,14 +412,12 @@ static struct dimm_size spd_get_dimm_size(unsigned int dimm_socket_address)
 | 
				
			|||||||
	struct dimm_size sz = sdram_spd_get_page_size(dimm_socket_address);
 | 
						struct dimm_size sz = sdram_spd_get_page_size(dimm_socket_address);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (sz.side1 > 0) {
 | 
						if (sz.side1 > 0) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		value = smbus_read_byte(dimm_socket_address, SPD_NUM_ROWS);
 | 
							value = smbus_read_byte(dimm_socket_address, SPD_NUM_ROWS);
 | 
				
			||||||
		die_on_spd_error(value);
 | 
							die_on_spd_error(value);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		sz.side1 += value & 0xf;
 | 
							sz.side1 += value & 0xf;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (sz.side2 > 0) {
 | 
							if (sz.side2 > 0) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
			// Double-sided DIMM
 | 
								// Double-sided DIMM
 | 
				
			||||||
			if (value & 0xF0)
 | 
								if (value & 0xF0)
 | 
				
			||||||
				sz.side2 += value >> 4;	// Asymmetric
 | 
									sz.side2 += value >> 4;	// Asymmetric
 | 
				
			||||||
@@ -496,7 +493,6 @@ static uint8_t spd_get_supported_dimms(const struct mem_controller *ctrl)
 | 
				
			|||||||
	// since we only support dual-channel.
 | 
						// since we only support dual-channel.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (i = 0; i < MAX_DIMM_SOCKETS_PER_CHANNEL; i++) {
 | 
						for (i = 0; i < MAX_DIMM_SOCKETS_PER_CHANNEL; i++) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		uint16_t channel0_dimm = ctrl->channel0[i];
 | 
							uint16_t channel0_dimm = ctrl->channel0[i];
 | 
				
			||||||
		uint16_t channel1_dimm = ctrl->channel1[i];
 | 
							uint16_t channel1_dimm = ctrl->channel1[i];
 | 
				
			||||||
		uint8_t bDualChannel = 1;
 | 
							uint8_t bDualChannel = 1;
 | 
				
			||||||
@@ -565,7 +561,6 @@ static uint8_t spd_get_supported_dimms(const struct mem_controller *ctrl)
 | 
				
			|||||||
		// NOTE: unpopulated DIMMs cause read to fail
 | 
							// NOTE: unpopulated DIMMs cause read to fail
 | 
				
			||||||
		spd_value = smbus_read_byte(channel1_dimm, SPD_MODULE_ATTRIBUTES);
 | 
							spd_value = smbus_read_byte(channel1_dimm, SPD_MODULE_ATTRIBUTES);
 | 
				
			||||||
		if (!(spd_value & MODULE_REGISTERED) || (spd_value < 0)) {
 | 
							if (!(spd_value & MODULE_REGISTERED) || (spd_value < 0)) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
			printk(BIOS_DEBUG, "Skipping un-matched DIMMs - only dual-channel operation supported\n");
 | 
								printk(BIOS_DEBUG, "Skipping un-matched DIMMs - only dual-channel operation supported\n");
 | 
				
			||||||
			continue;
 | 
								continue;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
@@ -580,7 +575,6 @@ static uint8_t spd_get_supported_dimms(const struct mem_controller *ctrl)
 | 
				
			|||||||
			if (!are_spd_values_equal
 | 
								if (!are_spd_values_equal
 | 
				
			||||||
			    (dual_channel_parameters[j], channel0_dimm,
 | 
								    (dual_channel_parameters[j], channel0_dimm,
 | 
				
			||||||
			     channel1_dimm)) {
 | 
								     channel1_dimm)) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
				bDualChannel = 0;
 | 
									bDualChannel = 0;
 | 
				
			||||||
				break;
 | 
									break;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
@@ -653,7 +647,6 @@ static void do_ram_command(uint8_t command, uint16_t jedec_mode_bits)
 | 
				
			|||||||
	 * Seems like rows 4-7 overlap with 0-3.
 | 
						 * Seems like rows 4-7 overlap with 0-3.
 | 
				
			||||||
	 */
 | 
						 */
 | 
				
			||||||
	for (i = 0; i < (MAX_NUM_CHANNELS * MAX_DIMM_SOCKETS_PER_CHANNEL); ++i) {
 | 
						for (i = 0; i < (MAX_NUM_CHANNELS * MAX_DIMM_SOCKETS_PER_CHANNEL); ++i) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		uint8_t dimm_end_64M_multiple = pci_read_config8(MCHDEV, DRB_ROW_0 + i);
 | 
							uint8_t dimm_end_64M_multiple = pci_read_config8(MCHDEV, DRB_ROW_0 + i);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (dimm_end_64M_multiple > dimm_start_64M_multiple) {
 | 
							if (dimm_end_64M_multiple > dimm_start_64M_multiple) {
 | 
				
			||||||
@@ -800,7 +793,6 @@ static void configure_e7501_ram_addresses(const struct mem_controller
 | 
				
			|||||||
	pci_write_config32(MCHDEV, DRB_ROW_4, 0);
 | 
						pci_write_config32(MCHDEV, DRB_ROW_4, 0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (i = 0; i < MAX_DIMM_SOCKETS_PER_CHANNEL; i++) {
 | 
						for (i = 0; i < MAX_DIMM_SOCKETS_PER_CHANNEL; i++) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		uint16_t dimm_socket_address = ctrl->channel0[i];
 | 
							uint16_t dimm_socket_address = ctrl->channel0[i];
 | 
				
			||||||
		struct dimm_size sz;
 | 
							struct dimm_size sz;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1020,7 +1012,6 @@ static void configure_e7501_cas_latency(const struct mem_controller *ctrl,
 | 
				
			|||||||
	uint32_t dimm_compatible_cas_latencies;
 | 
						uint32_t dimm_compatible_cas_latencies;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (i = 0; i < MAX_DIMM_SOCKETS; i++) {
 | 
						for (i = 0; i < MAX_DIMM_SOCKETS; i++) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		uint16_t dimm_socket_address;
 | 
							uint16_t dimm_socket_address;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (!(dimm_mask & (1 << i)))
 | 
							if (!(dimm_mask & (1 << i)))
 | 
				
			||||||
@@ -1098,7 +1089,6 @@ static void configure_e7501_cas_latency(const struct mem_controller *ctrl,
 | 
				
			|||||||
		dram_timing |= DRT_CAS_2_0;
 | 
							dram_timing |= DRT_CAS_2_0;
 | 
				
			||||||
		dram_read_timing |= 0x0222;
 | 
							dram_read_timing |= 0x0222;
 | 
				
			||||||
	} else if (system_compatible_cas_latencies & SPD_CAS_LATENCY_2_5) {
 | 
						} else if (system_compatible_cas_latencies & SPD_CAS_LATENCY_2_5) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		uint32_t dram_row_attributes =
 | 
							uint32_t dram_row_attributes =
 | 
				
			||||||
		    pci_read_config32(MCHDEV, DRA);
 | 
							    pci_read_config32(MCHDEV, DRA);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1111,7 +1101,6 @@ static void configure_e7501_cas_latency(const struct mem_controller *ctrl,
 | 
				
			|||||||
		    && (dram_row_attributes & 0xff00)
 | 
							    && (dram_row_attributes & 0xff00)
 | 
				
			||||||
		    && (dram_row_attributes & 0xff0000)
 | 
							    && (dram_row_attributes & 0xff0000)
 | 
				
			||||||
		    && (dram_row_attributes & 0xff000000)) {
 | 
							    && (dram_row_attributes & 0xff000000)) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
			// All slots populated
 | 
								// All slots populated
 | 
				
			||||||
			dram_read_timing |= 0x0882;
 | 
								dram_read_timing |= 0x0882;
 | 
				
			||||||
		} else {
 | 
							} else {
 | 
				
			||||||
@@ -1179,7 +1168,6 @@ static void configure_e7501_dram_controller_mode(const struct mem_controller *ct
 | 
				
			|||||||
	 */
 | 
						 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (i = 0; i < MAX_DIMM_SOCKETS; i++) {
 | 
						for (i = 0; i < MAX_DIMM_SOCKETS; i++) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		uint32_t dimm_refresh_mode;
 | 
							uint32_t dimm_refresh_mode;
 | 
				
			||||||
		int value;
 | 
							int value;
 | 
				
			||||||
		uint16_t dimm_socket_address;
 | 
							uint16_t dimm_socket_address;
 | 
				
			||||||
@@ -1250,7 +1238,6 @@ static void configure_e7501_row_attributes(const struct mem_controller
 | 
				
			|||||||
	uint32_t row_attributes = 0;
 | 
						uint32_t row_attributes = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (i = 0; i < MAX_DIMM_SOCKETS_PER_CHANNEL; i++) {
 | 
						for (i = 0; i < MAX_DIMM_SOCKETS_PER_CHANNEL; i++) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		uint16_t dimm_socket_address = ctrl->channel0[i];
 | 
							uint16_t dimm_socket_address = ctrl->channel0[i];
 | 
				
			||||||
		struct dimm_size page_size;
 | 
							struct dimm_size page_size;
 | 
				
			||||||
		struct dimm_size sdram_width;
 | 
							struct dimm_size sdram_width;
 | 
				
			||||||
@@ -1300,7 +1287,6 @@ static void enable_e7501_clocks(uint8_t dimm_mask)
 | 
				
			|||||||
	pci_write_config8(MCHDEV, 0x8e, 0xb0);
 | 
						pci_write_config8(MCHDEV, 0x8e, 0xb0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (i = 0; i < MAX_DIMM_SOCKETS_PER_CHANNEL; i++) {
 | 
						for (i = 0; i < MAX_DIMM_SOCKETS_PER_CHANNEL; i++) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		uint8_t socket_mask = 1 << i;
 | 
							uint8_t socket_mask = 1 << i;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (dimm_mask & socket_mask)
 | 
							if (dimm_mask & socket_mask)
 | 
				
			||||||
@@ -1702,7 +1688,6 @@ void sdram_initialize(void)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	/* If this is a warm boot, some initialisation can be skipped */
 | 
						/* If this is a warm boot, some initialisation can be skipped */
 | 
				
			||||||
	if (!e7505_mch_is_ready()) {
 | 
						if (!e7505_mch_is_ready()) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		/* The real MCH initialisation. */
 | 
							/* The real MCH initialisation. */
 | 
				
			||||||
		timestamp_add_now(TS_INITRAM_START);
 | 
							timestamp_add_now(TS_INITRAM_START);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -127,5 +127,4 @@ void fill_postcar_frame(struct postcar_frame *pcf)
 | 
				
			|||||||
			       MTRR_TYPE_WRBACK);
 | 
								       MTRR_TYPE_WRBACK);
 | 
				
			||||||
	postcar_frame_add_mtrr(pcf, northbridge_get_tseg_base(),
 | 
						postcar_frame_add_mtrr(pcf, northbridge_get_tseg_base(),
 | 
				
			||||||
			       northbridge_get_tseg_size(), MTRR_TYPE_WRBACK);
 | 
								       northbridge_get_tseg_size(), MTRR_TYPE_WRBACK);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,7 +36,6 @@ static unsigned long acpi_fill_dmar(unsigned long current)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	/* VTVC0BAR has to be set, enabled, and in 32-bit space */
 | 
						/* VTVC0BAR has to be set, enabled, and in 32-bit space */
 | 
				
			||||||
	if (vtvc0bar && vtvc0en && !mchbar_read32(VTVC0BAR + 4)) {
 | 
						if (vtvc0bar && vtvc0en && !mchbar_read32(VTVC0BAR + 4)) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		const unsigned long tmp = current;
 | 
							const unsigned long tmp = current;
 | 
				
			||||||
		current += acpi_create_dmar_drhd(current, DRHD_INCLUDE_PCI_ALL, 0, vtvc0bar);
 | 
							current += acpi_create_dmar_drhd(current, DRHD_INCLUDE_PCI_ALL, 0, vtvc0bar);
 | 
				
			||||||
		current += acpi_create_dmar_ds_ioapic_from_hw(current, IO_APIC_ADDR,
 | 
							current += acpi_create_dmar_ds_ioapic_from_hw(current, IO_APIC_ADDR,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -124,7 +124,6 @@ u32 gtt_read(u32 reg)
 | 
				
			|||||||
	u32 val;
 | 
						u32 val;
 | 
				
			||||||
	val = read32(res2mmio(gtt_res, reg, 0));
 | 
						val = read32(res2mmio(gtt_res, reg, 0));
 | 
				
			||||||
	return val;
 | 
						return val;
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void gtt_write(u32 reg, u32 data)
 | 
					void gtt_write(u32 reg, u32 data)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -59,5 +59,4 @@ void fill_postcar_frame(struct postcar_frame *pcf)
 | 
				
			|||||||
	top_of_ram = (uintptr_t)cbmem_top();
 | 
						top_of_ram = (uintptr_t)cbmem_top();
 | 
				
			||||||
	postcar_frame_add_mtrr(pcf, top_of_ram - 8*MiB, 8*MiB,
 | 
						postcar_frame_add_mtrr(pcf, top_of_ram - 8*MiB, 8*MiB,
 | 
				
			||||||
		MTRR_TYPE_WRBACK);
 | 
							MTRR_TYPE_WRBACK);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -755,7 +755,6 @@ static void set_dram_row_attributes(void)
 | 
				
			|||||||
		/* This is 440BX! We do EDO too! */
 | 
							/* This is 440BX! We do EDO too! */
 | 
				
			||||||
		if (value == SPD_MEMORY_TYPE_EDO
 | 
							if (value == SPD_MEMORY_TYPE_EDO
 | 
				
			||||||
			|| value == SPD_MEMORY_TYPE_SDRAM) {
 | 
								|| value == SPD_MEMORY_TYPE_SDRAM) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
			if (value == SPD_MEMORY_TYPE_EDO) {
 | 
								if (value == SPD_MEMORY_TYPE_EDO) {
 | 
				
			||||||
				edo = 1;
 | 
									edo = 1;
 | 
				
			||||||
			} else if (value == SPD_MEMORY_TYPE_SDRAM) {
 | 
								} else if (value == SPD_MEMORY_TYPE_SDRAM) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -290,7 +290,6 @@ static void i945_setup_egress_port(void)
 | 
				
			|||||||
		printk(BIOS_DEBUG, "timeout!\n");
 | 
							printk(BIOS_DEBUG, "timeout!\n");
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		printk(BIOS_DEBUG, "ok\n");
 | 
							printk(BIOS_DEBUG, "ok\n");
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void ich7_setup_dmi_rcrb(void)
 | 
					static void ich7_setup_dmi_rcrb(void)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -537,7 +537,6 @@ static int intel_gma_init_vga(struct northbridge_intel_i945_config *conf,
 | 
				
			|||||||
	vga_sr_write(1, vga_sr_read(1) & ~0x20);
 | 
						vga_sr_write(1, vga_sr_read(1) & ~0x20);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return 0;
 | 
						return 0;
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* compare the header of the vga edid header */
 | 
					/* compare the header of the vga edid header */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -49,7 +49,6 @@ static int get_dimm_spd_address(struct sys_info *sysinfo, int device)
 | 
				
			|||||||
		return sysinfo->spd_addresses[device];
 | 
							return sysinfo->spd_addresses[device];
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		return 0x50 + device;
 | 
							return 0x50 + device;
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static __attribute__((noinline)) void do_ram_command(u32 command)
 | 
					static __attribute__((noinline)) void do_ram_command(u32 command)
 | 
				
			||||||
@@ -226,7 +225,6 @@ static void sdram_detect_errors(struct sys_info *sysinfo)
 | 
				
			|||||||
			/* Write back clears bit 2 */
 | 
								/* Write back clears bit 2 */
 | 
				
			||||||
			pci_write_config8(PCI_DEV(0, 0x1f, 0), GEN_PMCON_2, reg8);
 | 
								pci_write_config8(PCI_DEV(0, 0x1f, 0), GEN_PMCON_2, reg8);
 | 
				
			||||||
			do_reset = true;
 | 
								do_reset = true;
 | 
				
			||||||
 | 
					 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (reg8 & (1 << 7)) {
 | 
							if (reg8 & (1 << 7)) {
 | 
				
			||||||
@@ -289,7 +287,6 @@ struct timings {
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
static void gather_common_timing(struct sys_info *sysinfo, struct timings *saved_timings)
 | 
					static void gather_common_timing(struct sys_info *sysinfo, struct timings *saved_timings)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	int i, j;
 | 
						int i, j;
 | 
				
			||||||
	u8 raw_spd[SPD_SIZE_MAX_DDR2];
 | 
						u8 raw_spd[SPD_SIZE_MAX_DDR2];
 | 
				
			||||||
	u8 dimm_mask = 0;
 | 
						u8 dimm_mask = 0;
 | 
				
			||||||
@@ -2313,7 +2310,6 @@ static void sdram_power_management(struct sys_info *sysinfo)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static void sdram_thermal_management(void)
 | 
					static void sdram_thermal_management(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	mchbar_write8(TCO1, 0);
 | 
						mchbar_write8(TCO1, 0);
 | 
				
			||||||
	mchbar_write8(TCO0, 0);
 | 
						mchbar_write8(TCO0, 0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -83,7 +83,6 @@ static void set_receive_enable(int channel_offset, u8 medium, u8 coarse)
 | 
				
			|||||||
		reg32 |= medium;
 | 
							reg32 |= medium;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	mchbar_write32(RCVENMT, reg32);
 | 
						mchbar_write32(RCVENMT, reg32);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int normalize(int channel_offset, u8 *mediumcoarse, u8 *fine)
 | 
					static int normalize(int channel_offset, u8 *mediumcoarse, u8 *fine)
 | 
				
			||||||
@@ -190,7 +189,6 @@ static int find_strobes_low(int channel_offset, u8 *mediumcoarse, u8 *fine,
 | 
				
			|||||||
			continue;
 | 
								continue;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	printk(BIOS_DEBUG, "Could not find low strobe\n");
 | 
						printk(BIOS_DEBUG, "Could not find low strobe\n");
 | 
				
			||||||
@@ -200,7 +198,6 @@ static int find_strobes_low(int channel_offset, u8 *mediumcoarse, u8 *fine,
 | 
				
			|||||||
static int find_strobes_edge(int channel_offset, u8 *mediumcoarse, u8 *fine,
 | 
					static int find_strobes_edge(int channel_offset, u8 *mediumcoarse, u8 *fine,
 | 
				
			||||||
			     struct sys_info *sysinfo)
 | 
								     struct sys_info *sysinfo)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	int counter;
 | 
						int counter;
 | 
				
			||||||
	u32 rcvenmt;
 | 
						u32 rcvenmt;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -168,7 +168,6 @@ static void ironlake_init(void *const chip_info)
 | 
				
			|||||||
	const struct device *const d0f0 = pcidev_on_root(0, 0);
 | 
						const struct device *const d0f0 = pcidev_on_root(0, 0);
 | 
				
			||||||
	if (d0f0)
 | 
						if (d0f0)
 | 
				
			||||||
		pci_update_config32(d0f0, DEVEN, deven_mask, 0);
 | 
							pci_update_config32(d0f0, DEVEN, deven_mask, 0);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static struct device_operations mc_ops = {
 | 
					static struct device_operations mc_ops = {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1552,7 +1552,6 @@ static void read_4090(struct raminfo *info)
 | 
				
			|||||||
							      rank), 9)
 | 
												      rank), 9)
 | 
				
			||||||
						    + (i == 1) * 11;	// !!!!
 | 
											    + (i == 1) * 11;	// !!!!
 | 
				
			||||||
					}
 | 
										}
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static u32 get_etalon2(int flip, u32 addr)
 | 
					static u32 get_etalon2(int flip, u32 addr)
 | 
				
			||||||
@@ -2759,7 +2758,6 @@ static void do_ram_training(struct raminfo *info)
 | 
				
			|||||||
								 timings);
 | 
													 timings);
 | 
				
			||||||
						totalrank++;
 | 
											totalrank++;
 | 
				
			||||||
					}
 | 
										}
 | 
				
			||||||
 | 
					 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	} else {
 | 
						} else {
 | 
				
			||||||
		for (reg_178 = reg178_center - 12;
 | 
							for (reg_178 = reg178_center - 12;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -76,7 +76,6 @@ static uintptr_t northbridge_get_tseg_base(void)
 | 
				
			|||||||
uintptr_t cbmem_top_chipset(void)
 | 
					uintptr_t cbmem_top_chipset(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	return ALIGN_DOWN(northbridge_get_tseg_base(), 4 * MiB);
 | 
						return ALIGN_DOWN(northbridge_get_tseg_base(), 4 * MiB);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void smm_region(uintptr_t *start, size_t *size)
 | 
					void smm_region(uintptr_t *start, size_t *size)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -377,7 +377,6 @@ static void init_dram_ddr3(int s3resume, const u32 cpuid)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	/* Before reusing training data, assert that the CPU has not been replaced */
 | 
						/* Before reusing training data, assert that the CPU has not been replaced */
 | 
				
			||||||
	if (ctrl_cached && cpuid != ctrl_cached->cpu) {
 | 
						if (ctrl_cached && cpuid != ctrl_cached->cpu) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		/* It is not really worrying on a cold boot, but fatal when resuming from S3 */
 | 
							/* It is not really worrying on a cold boot, but fatal when resuming from S3 */
 | 
				
			||||||
		printk(s3resume ? BIOS_ALERT : BIOS_NOTICE,
 | 
							printk(s3resume ? BIOS_ALERT : BIOS_NOTICE,
 | 
				
			||||||
				"CPUID %x differs from stored CPUID %x, CPU was replaced!\n",
 | 
									"CPUID %x differs from stored CPUID %x, CPU was replaced!\n",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -64,7 +64,6 @@ void dram_find_common_params(ramctr_timing *ctrl)
 | 
				
			|||||||
	valid_dimms = 0;
 | 
						valid_dimms = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	FOR_ALL_CHANNELS for (slot = 0; slot < 2; slot++) {
 | 
						FOR_ALL_CHANNELS for (slot = 0; slot < 2; slot++) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		const struct dimm_attr_ddr3_st *dimm = &dimms->dimm[channel][slot];
 | 
							const struct dimm_attr_ddr3_st *dimm = &dimms->dimm[channel][slot];
 | 
				
			||||||
		if (dimm->dram_type != SPD_MEMORY_TYPE_SDRAM_DDR3)
 | 
							if (dimm->dram_type != SPD_MEMORY_TYPE_SDRAM_DDR3)
 | 
				
			||||||
			continue;
 | 
								continue;
 | 
				
			||||||
@@ -1138,7 +1137,6 @@ static void fine_tune_rcven_pi(ramctr_timing *ctrl, int channel, int slotrank, i
 | 
				
			|||||||
	int lane, i;
 | 
						int lane, i;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (rcven_delta = -25; rcven_delta <= 25; rcven_delta++) {
 | 
						for (rcven_delta = -25; rcven_delta <= 25; rcven_delta++) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		FOR_ALL_LANES {
 | 
							FOR_ALL_LANES {
 | 
				
			||||||
			ctrl->timings[channel][slotrank].lanes[lane].rcven
 | 
								ctrl->timings[channel][slotrank].lanes[lane].rcven
 | 
				
			||||||
				= upperA[lane] + rcven_delta + QCLK_PI;
 | 
									= upperA[lane] + rcven_delta + QCLK_PI;
 | 
				
			||||||
@@ -1358,7 +1356,6 @@ int receive_enable_calibration(ramctr_timing *ctrl)
 | 
				
			|||||||
			FOR_ALL_LANES {
 | 
								FOR_ALL_LANES {
 | 
				
			||||||
				ctrl->timings[channel][slotrank].lanes[lane].rcven -= QCLK_PI;
 | 
									ctrl->timings[channel][slotrank].lanes[lane].rcven -= QCLK_PI;
 | 
				
			||||||
				upperA[lane] -= QCLK_PI;
 | 
									upperA[lane] -= QCLK_PI;
 | 
				
			||||||
 | 
					 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		} else if (some_high) {
 | 
							} else if (some_high) {
 | 
				
			||||||
			ctrl->timings[channel][slotrank].roundtrip_latency++;
 | 
								ctrl->timings[channel][slotrank].roundtrip_latency++;
 | 
				
			||||||
@@ -1657,7 +1654,6 @@ static void train_write_flyby(ramctr_timing *ctrl)
 | 
				
			|||||||
		fill_pattern1(ctrl, channel);
 | 
							fill_pattern1(ctrl, channel);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	FOR_ALL_POPULATED_CHANNELS FOR_ALL_POPULATED_RANKS {
 | 
						FOR_ALL_POPULATED_CHANNELS FOR_ALL_POPULATED_RANKS {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		/* Reset read and write WDB pointers */
 | 
							/* Reset read and write WDB pointers */
 | 
				
			||||||
		mchbar_write32(IOSAV_DATA_CTL_ch(channel), 0x10001);
 | 
							mchbar_write32(IOSAV_DATA_CTL_ch(channel), 0x10001);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2501,7 +2497,6 @@ int aggressive_write_training(ramctr_timing *ctrl)
 | 
				
			|||||||
						upper[channel][slotrank][lane] =
 | 
											upper[channel][slotrank][lane] =
 | 
				
			||||||
							MIN(rn.end - ctrl->tx_dq_offset[i],
 | 
												MIN(rn.end - ctrl->tx_dq_offset[i],
 | 
				
			||||||
							    upper[channel][slotrank][lane]);
 | 
												    upper[channel][slotrank][lane]);
 | 
				
			||||||
 | 
					 | 
				
			||||||
					}
 | 
										}
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
@@ -2621,7 +2616,6 @@ void channel_scrub(ramctr_timing *ctrl)
 | 
				
			|||||||
		rowsize = 1 << ctrl->info.dimm[channel][slotrank >> 1].row_bits;
 | 
							rowsize = 1 << ctrl->info.dimm[channel][slotrank >> 1].row_bits;
 | 
				
			||||||
		for (bank = 0; bank < 8; bank++) {
 | 
							for (bank = 0; bank < 8; bank++) {
 | 
				
			||||||
			for (row = 0; row < rowsize; row += 16) {
 | 
								for (row = 0; row < rowsize; row += 16) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
				u8 gap = MAX((ctrl->tFAW >> 2) + 1, ctrl->tRRD);
 | 
									u8 gap = MAX((ctrl->tFAW >> 2) + 1, ctrl->tRRD);
 | 
				
			||||||
				const struct iosav_ssq sequence[] = {
 | 
									const struct iosav_ssq sequence[] = {
 | 
				
			||||||
					/*
 | 
										/*
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -295,7 +295,6 @@ static void devicetree_fill_pei_data(struct pei_data *pei_data)
 | 
				
			|||||||
	case 800:
 | 
						case 800:
 | 
				
			||||||
		pei_data->max_ddr3_freq = 1600;
 | 
							pei_data->max_ddr3_freq = 1600;
 | 
				
			||||||
		break;
 | 
							break;
 | 
				
			||||||
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -274,7 +274,6 @@ static unsigned int get_mem_min_tck(void)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	/* If non-zero, it was set in the devicetree */
 | 
						/* If non-zero, it was set in the devicetree */
 | 
				
			||||||
	if (cfg->max_mem_clock_mhz) {
 | 
						if (cfg->max_mem_clock_mhz) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		if (cfg->max_mem_clock_mhz >= 1066)
 | 
							if (cfg->max_mem_clock_mhz >= 1066)
 | 
				
			||||||
			return TCK_1066MHZ;
 | 
								return TCK_1066MHZ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -147,7 +147,6 @@ static enum cb_err ddr2_save_dimminfo(u8 dimm_idx, u8 *raw_spd,
 | 
				
			|||||||
		dram_print_spd_ddr2(&decoded_dimm);
 | 
							dram_print_spd_ddr2(&decoded_dimm);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (!(decoded_dimm.width & (0x08 | 0x10))) {
 | 
						if (!(decoded_dimm.width & (0x08 | 0x10))) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		printk(BIOS_ERR, "DIMM%d Unsupported width: x%d. Disabling dimm\n",
 | 
							printk(BIOS_ERR, "DIMM%d Unsupported width: x%d. Disabling dimm\n",
 | 
				
			||||||
			dimm_idx, s->dimms[dimm_idx].width);
 | 
								dimm_idx, s->dimms[dimm_idx].width);
 | 
				
			||||||
		return CB_ERR;
 | 
							return CB_ERR;
 | 
				
			||||||
@@ -523,7 +522,6 @@ static void find_dimm_config(struct sysinfo *s)
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
		printk(BIOS_DEBUG, "  Config[CH%d] : %d\n", chan, s->dimm_config[chan]);
 | 
							printk(BIOS_DEBUG, "  Config[CH%d] : %d\n", chan, s->dimm_config[chan]);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void checkreset_ddr2(int boot_path)
 | 
					static void checkreset_ddr2(int boot_path)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -247,7 +247,6 @@ enum dc_winc_filter_p {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Window A/B/C register 0x500 ~ 0x628 */
 | 
					/* Window A/B/C register 0x500 ~ 0x628 */
 | 
				
			||||||
struct dc_winc_reg {
 | 
					struct dc_winc_reg {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Address 0x500 */
 | 
						/* Address 0x500 */
 | 
				
			||||||
	u32 color_palette;		/* _WINC_COLOR_PALETTE_0 */
 | 
						u32 color_palette;		/* _WINC_COLOR_PALETTE_0 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -440,7 +440,6 @@ static void tegra_dc_dp_dump_link_cfg(struct tegra_dc_dp_data *dp,
 | 
				
			|||||||
static int _tegra_dp_lower_link_config(struct tegra_dc_dp_data *dp,
 | 
					static int _tegra_dp_lower_link_config(struct tegra_dc_dp_data *dp,
 | 
				
			||||||
	struct tegra_dc_dp_link_config *cfg)
 | 
						struct tegra_dc_dp_link_config *cfg)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	switch (cfg->link_bw){
 | 
						switch (cfg->link_bw){
 | 
				
			||||||
	case SOR_LINK_SPEED_G1_62:
 | 
						case SOR_LINK_SPEED_G1_62:
 | 
				
			||||||
		if (cfg->max_link_bw > SOR_LINK_SPEED_G1_62)
 | 
							if (cfg->max_link_bw > SOR_LINK_SPEED_G1_62)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -51,7 +51,6 @@ enum {
 | 
				
			|||||||
 * Defines the SDRAM parameter structure
 | 
					 * Defines the SDRAM parameter structure
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct sdram_params {
 | 
					struct sdram_params {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Specifies the type of memory device */
 | 
						/* Specifies the type of memory device */
 | 
				
			||||||
	uint32_t MemoryType;
 | 
						uint32_t MemoryType;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -722,7 +722,6 @@ void tegra_dc_sor_enable_dp(struct tegra_dc_sor_data *sor)
 | 
				
			|||||||
	tegra_dc_sor_power_dplanes(sor, link_cfg->lane_count, 1);
 | 
						tegra_dc_sor_power_dplanes(sor, link_cfg->lane_count, 1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	tegra_dc_sor_set_dp_mode(sor, link_cfg);
 | 
						tegra_dc_sor_set_dp_mode(sor, link_cfg);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void tegra_dc_sor_attach(struct tegra_dc_sor_data *sor)
 | 
					void tegra_dc_sor_attach(struct tegra_dc_sor_data *sor)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,7 +38,6 @@ int sdram_size_mb(void)
 | 
				
			|||||||
static void carveout_from_regs(uintptr_t *base_mib, size_t *size_mib,
 | 
					static void carveout_from_regs(uintptr_t *base_mib, size_t *size_mib,
 | 
				
			||||||
				uint32_t bom, uint32_t bom_hi, uint32_t size)
 | 
									uint32_t bom, uint32_t bom_hi, uint32_t size)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* All size regs of carveouts are in MiB. */
 | 
						/* All size regs of carveouts are in MiB. */
 | 
				
			||||||
	if (size == 0)
 | 
						if (size == 0)
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -452,7 +452,6 @@ static void tegra_dc_dp_dump_link_cfg(struct tegra_dc_dp_data *dp,
 | 
				
			|||||||
static int _tegra_dp_lower_link_config(struct tegra_dc_dp_data *dp,
 | 
					static int _tegra_dp_lower_link_config(struct tegra_dc_dp_data *dp,
 | 
				
			||||||
	struct tegra_dc_dp_link_config *link_cfg)
 | 
						struct tegra_dc_dp_link_config *link_cfg)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	switch (link_cfg->link_bw) {
 | 
						switch (link_cfg->link_bw) {
 | 
				
			||||||
	case SOR_LINK_SPEED_G1_62:
 | 
						case SOR_LINK_SPEED_G1_62:
 | 
				
			||||||
		if (link_cfg->max_link_bw > SOR_LINK_SPEED_G1_62)
 | 
							if (link_cfg->max_link_bw > SOR_LINK_SPEED_G1_62)
 | 
				
			||||||
@@ -1457,7 +1456,6 @@ static int tegra_dc_dp_sink_out_of_sync(struct tegra_dc_dp_data *dp,
 | 
				
			|||||||
static void tegra_dc_dp_check_sink(struct tegra_dc_dp_data *dp,
 | 
					static void tegra_dc_dp_check_sink(struct tegra_dc_dp_data *dp,
 | 
				
			||||||
				struct soc_nvidia_tegra210_config *config)
 | 
									struct soc_nvidia_tegra210_config *config)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	u8 max_retry = 3;
 | 
						u8 max_retry = 3;
 | 
				
			||||||
	int delay_frame;
 | 
						int delay_frame;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,7 +30,6 @@ enum {
 | 
				
			|||||||
 * currently the I2C is 0-based and SPI is 1-based in its indexing.
 | 
					 * currently the I2C is 0-based and SPI is 1-based in its indexing.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
enum {
 | 
					enum {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	I2C1_BUS = 0,
 | 
						I2C1_BUS = 0,
 | 
				
			||||||
	I2C2_BUS = 1,
 | 
						I2C2_BUS = 1,
 | 
				
			||||||
	I2C3_BUS = 2,
 | 
						I2C3_BUS = 2,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -54,7 +54,6 @@ enum {
 | 
				
			|||||||
 * Defines the SDRAM parameter structure
 | 
					 * Defines the SDRAM parameter structure
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct sdram_params {
 | 
					struct sdram_params {
 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* Specifies the type of memory device */
 | 
						/* Specifies the type of memory device */
 | 
				
			||||||
	uint32_t MemoryType;
 | 
						uint32_t MemoryType;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,7 +13,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
int mipi_dphy_set_timing(struct tegra_dsi *dsi)
 | 
					int mipi_dphy_set_timing(struct tegra_dsi *dsi)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	u32 freq = (dsi->clk_rate * 2) / 1000000;
 | 
						u32 freq = (dsi->clk_rate * 2) / 1000000;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	u32 thsdexit = (DSI_PHY_TIMING_DIV(120, (freq)));
 | 
						u32 thsdexit = (DSI_PHY_TIMING_DIV(120, (freq)));
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -798,7 +798,6 @@ static void sdram_set_clock_enable_signal(const struct sdram_params *param,
 | 
				
			|||||||
	uint32_t val = 0;
 | 
						uint32_t val = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (param->MemoryType == NvBootMemoryType_LpDdr4) {
 | 
						if (param->MemoryType == NvBootMemoryType_LpDdr4) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		val = (param->EmcPinGpioEn << EMC_PIN_GPIOEN_SHIFT) |
 | 
							val = (param->EmcPinGpioEn << EMC_PIN_GPIOEN_SHIFT) |
 | 
				
			||||||
		      (param->EmcPinGpio << EMC_PIN_GPIO_SHIFT);
 | 
							      (param->EmcPinGpio << EMC_PIN_GPIO_SHIFT);
 | 
				
			||||||
		write32(®s->pin, val);
 | 
							write32(®s->pin, val);
 | 
				
			||||||
@@ -835,7 +834,6 @@ static void sdram_set_clock_enable_signal(const struct sdram_params *param,
 | 
				
			|||||||
		die("Failed to program EMC pin.");
 | 
							die("Failed to program EMC pin.");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (param->MemoryType != NvBootMemoryType_LpDdr4) {
 | 
						if (param->MemoryType != NvBootMemoryType_LpDdr4) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		/* Send NOP (trigger just needs to be non-zero) */
 | 
							/* Send NOP (trigger just needs to be non-zero) */
 | 
				
			||||||
		writebits(((1 << EMC_NOP_CMD_SHIFT) |
 | 
							writebits(((1 << EMC_NOP_CMD_SHIFT) |
 | 
				
			||||||
			  (param->EmcDevSelect << EMC_NOP_DEV_SELECTN_SHIFT)),
 | 
								  (param->EmcDevSelect << EMC_NOP_DEV_SELECTN_SHIFT)),
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -716,7 +716,6 @@ void tegra_dc_sor_enable_dp(struct tegra_dc_sor_data *sor)
 | 
				
			|||||||
	tegra_dc_sor_power_dplanes(sor, link_cfg->lane_count, 1);
 | 
						tegra_dc_sor_power_dplanes(sor, link_cfg->lane_count, 1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	tegra_dc_sor_set_dp_mode(sor, link_cfg);
 | 
						tegra_dc_sor_set_dp_mode(sor, link_cfg);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void tegra_dc_sor_attach(struct tegra_dc_sor_data *sor)
 | 
					void tegra_dc_sor_attach(struct tegra_dc_sor_data *sor)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -411,7 +411,6 @@ void clock_gate(void)
 | 
				
			|||||||
	clrbits32(&exynos_clock->gate_ip_cdrex, CLK_DPHY0_MASK |
 | 
						clrbits32(&exynos_clock->gate_ip_cdrex, CLK_DPHY0_MASK |
 | 
				
			||||||
						CLK_DPHY1_MASK |
 | 
											CLK_DPHY1_MASK |
 | 
				
			||||||
						CLK_TZASC_DRBXR_MASK);
 | 
											CLK_TZASC_DRBXR_MASK);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void clock_init_dp_clock(void)
 | 
					void clock_init_dp_clock(void)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -115,7 +115,6 @@ int s5p_dp_init_analog_func(struct s5p_dp_device *dp)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	/* Power up PLL */
 | 
						/* Power up PLL */
 | 
				
			||||||
	if (s5p_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) {
 | 
						if (s5p_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		clrbits32(&base->dp_pll_ctl, DP_PLL_PD);
 | 
							clrbits32(&base->dp_pll_ctl, DP_PLL_PD);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		stopwatch_init_msecs_expire(&sw, PLL_LOCK_TIMEOUT);
 | 
							stopwatch_init_msecs_expire(&sw, PLL_LOCK_TIMEOUT);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -186,7 +186,6 @@ int ddr3_mem_ctrl_init(struct mem_timings *mem, int interleave_size, int reset)
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (mem->gate_leveling_enable) {
 | 
						if (mem->gate_leveling_enable) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		write32(&exynos_phy0_control->phy_con0, PHY_CON0_RESET_VAL);
 | 
							write32(&exynos_phy0_control->phy_con0, PHY_CON0_RESET_VAL);
 | 
				
			||||||
		write32(&exynos_phy1_control->phy_con0, PHY_CON0_RESET_VAL);
 | 
							write32(&exynos_phy1_control->phy_con0, PHY_CON0_RESET_VAL);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -142,7 +142,6 @@ static unsigned int exynos_dp_read_edid(void)
 | 
				
			|||||||
			exynos_dp_write_byte_to_dpcd(DPCD_TEST_RESPONSE,
 | 
								exynos_dp_write_byte_to_dpcd(DPCD_TEST_RESPONSE,
 | 
				
			||||||
				DPCD_TEST_EDID_CHECKSUM_WRITE);
 | 
									DPCD_TEST_EDID_CHECKSUM_WRITE);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return 0;
 | 
						return 0;
 | 
				
			||||||
@@ -338,7 +337,6 @@ static unsigned int exynos_dp_enable_rx_to_enhanced_mode(unsigned char enable)
 | 
				
			|||||||
	if (ret != EXYNOS_DP_SUCCESS) {
 | 
						if (ret != EXYNOS_DP_SUCCESS) {
 | 
				
			||||||
		printk(BIOS_ERR, "DP write_to_dpcd failed\n");
 | 
							printk(BIOS_ERR, "DP write_to_dpcd failed\n");
 | 
				
			||||||
		return -1;
 | 
							return -1;
 | 
				
			||||||
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return ret;
 | 
						return ret;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -110,7 +110,6 @@ static inline void ux00ddr_setuprangeprotection(size_t ahbregaddr, size_t end_ad
 | 
				
			|||||||
  _REG32(225<<2, ahbregaddr) = 0xFFFFFFFF;
 | 
					  _REG32(225<<2, ahbregaddr) = 0xFFFFFFFF;
 | 
				
			||||||
  _REG32(208<<2, ahbregaddr) |= (1 << AXI0_ADDRESS_RANGE_ENABLE);
 | 
					  _REG32(208<<2, ahbregaddr) |= (1 << AXI0_ADDRESS_RANGE_ENABLE);
 | 
				
			||||||
  _REG32(208<<2, ahbregaddr) |= (1 << PORT_ADDR_PROTECTION_EN_OFFSET);
 | 
					  _REG32(208<<2, ahbregaddr) |= (1 << PORT_ADDR_PROTECTION_EN_OFFSET);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static inline void ux00ddr_disableaxireadinterleave(size_t ahbregaddr) {
 | 
					static inline void ux00ddr_disableaxireadinterleave(size_t ahbregaddr) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -114,5 +114,4 @@ void intel_acpi_pcie_hotplug_generator(bool *hotplug_map, int port_number)
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	acpigen_pop_len();
 | 
						acpigen_pop_len();
 | 
				
			||||||
	acpigen_pop_len();
 | 
						acpigen_pop_len();
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -320,7 +320,6 @@ static int block_cmd_loop(uintptr_t base, u8 *buf, size_t max_bytes, int flags)
 | 
				
			|||||||
					host_and_or(base, SMBHSTCTL, 0xff,
 | 
										host_and_or(base, SMBHSTCTL, 0xff,
 | 
				
			||||||
						    SMBHSTCNT_LAST_BYTE);
 | 
											    SMBHSTCNT_LAST_BYTE);
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
 | 
					 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			/* Engine internally completes the transaction
 | 
								/* Engine internally completes the transaction
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -913,7 +913,6 @@ static const struct spi_flash_ops spi_flash_ops = {
 | 
				
			|||||||
static int spi_flash_programmer_probe(const struct spi_slave *spi,
 | 
					static int spi_flash_programmer_probe(const struct spi_slave *spi,
 | 
				
			||||||
					struct spi_flash *flash)
 | 
										struct spi_flash *flash)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	if (CONFIG(SOUTHBRIDGE_INTEL_I82801GX))
 | 
						if (CONFIG(SOUTHBRIDGE_INTEL_I82801GX))
 | 
				
			||||||
		return spi_flash_generic_probe(spi, flash);
 | 
							return spi_flash_generic_probe(spi, flash);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,7 +16,6 @@
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
void acpi_fill_fadt(acpi_fadt_t *fadt)
 | 
					void acpi_fill_fadt(acpi_fadt_t *fadt)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	fadt->pm1a_evt_blk = DEFAULT_PMBASE;
 | 
						fadt->pm1a_evt_blk = DEFAULT_PMBASE;
 | 
				
			||||||
	fadt->pm1a_cnt_blk = DEFAULT_PMBASE + PMCNTRL;
 | 
						fadt->pm1a_cnt_blk = DEFAULT_PMBASE + PMCNTRL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -54,7 +54,6 @@ void sata_enable(struct device *dev)
 | 
				
			|||||||
			config->sata_mode = SATA_MODE_IDE_PLAIN;
 | 
								config->sata_mode = SATA_MODE_IDE_PLAIN;
 | 
				
			||||||
			printk(BIOS_DEBUG, "AHCI not supported, falling back to plain mode.\n");
 | 
								printk(BIOS_DEBUG, "AHCI not supported, falling back to plain mode.\n");
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (config->sata_mode == SATA_MODE_AHCI) {
 | 
						if (config->sata_mode == SATA_MODE_AHCI) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -52,7 +52,6 @@ static void pci_init(struct device *dev)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	/* Enable expresscard hotplug events.  */
 | 
						/* Enable expresscard hotplug events.  */
 | 
				
			||||||
	if (config->pcie_hotplug_map[PCI_FUNC(dev->path.pci.devfn)]) {
 | 
						if (config->pcie_hotplug_map[PCI_FUNC(dev->path.pci.devfn)]) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		pci_or_config32(dev, 0xd8, 1 << 30);
 | 
							pci_or_config32(dev, 0xd8, 1 << 30);
 | 
				
			||||||
		pci_write_config16(dev, 0x42, 0x142);
 | 
							pci_write_config16(dev, 0x42, 0x142);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -52,7 +52,6 @@ static void pci_init(struct device *dev)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	/* Enable expresscard hotplug events.  */
 | 
						/* Enable expresscard hotplug events.  */
 | 
				
			||||||
	if (config->pcie_hotplug_map[PCI_FUNC(dev->path.pci.devfn)]) {
 | 
						if (config->pcie_hotplug_map[PCI_FUNC(dev->path.pci.devfn)]) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
		pci_or_config32(dev, 0xd8, 1 << 30);
 | 
							pci_or_config32(dev, 0xd8, 1 << 30);
 | 
				
			||||||
		pci_write_config16(dev, 0x42, 0x142);
 | 
							pci_write_config16(dev, 0x42, 0x142);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,7 +20,6 @@ static void p64h2_pcix_init(struct device *dev)
 | 
				
			|||||||
	pci_write_config32(dev, ACNF, dword);
 | 
						pci_write_config32(dev, ACNF, dword);
 | 
				
			||||||
	byte = 0x08;
 | 
						byte = 0x08;
 | 
				
			||||||
	pci_write_config8(dev, MTT, byte);
 | 
						pci_write_config8(dev, MTT, byte);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
static struct device_operations pcix_ops  = {
 | 
					static struct device_operations pcix_ops  = {
 | 
				
			||||||
	.read_resources   = pci_bus_read_resources,
 | 
						.read_resources   = pci_bus_read_resources,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -231,7 +231,6 @@ static void pcie_enable_clock_gating(void)
 | 
				
			|||||||
		rp = root_port_number(dev);
 | 
							rp = root_port_number(dev);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (!is_rp_enabled(rp)) {
 | 
							if (!is_rp_enabled(rp)) {
 | 
				
			||||||
 | 
					 | 
				
			||||||
			/* Configure shared resource clock gating. */
 | 
								/* Configure shared resource clock gating. */
 | 
				
			||||||
			if (rp == 1 || rp == 5 || (rp == 6 && is_lp))
 | 
								if (rp == 1 || rp == 5 || (rp == 6 && is_lp))
 | 
				
			||||||
				pci_or_config8(dev, 0xe1, 0x3c);
 | 
									pci_or_config8(dev, 0xe1, 0x3c);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -142,7 +142,6 @@ static void rl5c476_init(struct device *dev)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static void rl5c476_read_resources(struct device *dev)
 | 
					static void rl5c476_read_resources(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	struct resource *resource;
 | 
						struct resource *resource;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* For CF socket we need an extra memory window for
 | 
						/* For CF socket we need an extra memory window for
 | 
				
			||||||
@@ -173,7 +172,6 @@ static void rl5c476_set_resources(struct device *dev)
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pci_dev_set_resources(dev);
 | 
						pci_dev_set_resources(dev);
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void rl5c476_set_subsystem(struct device *dev, unsigned int vendor,
 | 
					static void rl5c476_set_subsystem(struct device *dev, unsigned int vendor,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static void ti_pci1x2y_init(struct device *dev)
 | 
					static void ti_pci1x2y_init(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					 | 
				
			||||||
	printk(BIOS_INFO, "Init of Texas Instruments PCI1x2x PCMCIA/CardBus controller\n");
 | 
						printk(BIOS_INFO, "Init of Texas Instruments PCI1x2x PCMCIA/CardBus controller\n");
 | 
				
			||||||
	struct southbridge_ti_pci1x2x_config *conf = dev->chip_info;
 | 
						struct southbridge_ti_pci1x2x_config *conf = dev->chip_info;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user