diff --git a/src/mainboard/intel/galileo/gen1.h b/src/mainboard/intel/galileo/gen1.h
index 26335dad61..e1e8f59070 100644
--- a/src/mainboard/intel/galileo/gen1.h
+++ b/src/mainboard/intel/galileo/gen1.h
@@ -13,6 +13,9 @@
  * GNU General Public License for more details.
  */
 
+/* PCIe reset pin */
+#define GEN1_PCI_RESET_RESUMEWELL_GPIO		3
+
 /* Jumper J2 determines the slave address of Cypress I/O GPIO expander */
 #define GALILEO_DETERMINE_IOEXP_SLA_RESUMEWELL_GPIO     5
 
diff --git a/src/mainboard/intel/galileo/gen2.h b/src/mainboard/intel/galileo/gen2.h
index 108971b8ba..8eee744392 100644
--- a/src/mainboard/intel/galileo/gen2.h
+++ b/src/mainboard/intel/galileo/gen2.h
@@ -13,6 +13,9 @@
  * GNU General Public License for more details.
  */
 
+/* PCIe reset pin */
+#define GEN2_PCI_RESET_RESUMEWELL_GPIO		0
+
 static const struct reg_script gen2_gpio_init[] = {
 	/* Initialize the legacy GPIO controller */
 	REG_LEG_GPIO_WRITE(R_QNC_GPIO_CGEN_CORE_WELL, 0x03),
diff --git a/src/mainboard/intel/galileo/gpio.c b/src/mainboard/intel/galileo/gpio.c
index a411c5a0ff..31843814c2 100644
--- a/src/mainboard/intel/galileo/gpio.c
+++ b/src/mainboard/intel/galileo/gpio.c
@@ -50,3 +50,20 @@ void mainboard_gpio_init(void)
 		script = gen1_gpio_init;
 	reg_script_run(script);
 }
+
+void mainboard_gpio_pcie_reset(uint32_t pin_value)
+{
+	uint32_t pin_number;
+	uint32_t value;
+
+	/* Determine the correct PCIe reset pin */
+	if (IS_ENABLED(CONFIG_GALILEO_GEN2))
+		pin_number = GEN2_PCI_RESET_RESUMEWELL_GPIO;
+	else
+		pin_number = GEN1_PCI_RESET_RESUMEWELL_GPIO;
+
+	/* Update the PCIe reset value */
+	value = reg_legacy_gpio_read(R_QNC_GPIO_RGLVL_RESUME_WELL);
+	value = (value & ~(1 << pin_number)) | ((pin_value & 1) << pin_number);
+	reg_legacy_gpio_write(R_QNC_GPIO_RGLVL_RESUME_WELL, value);
+}
diff --git a/src/soc/intel/quark/include/soc/pci_devs.h b/src/soc/intel/quark/include/soc/pci_devs.h
index 67d8d32feb..ff9d65f6ef 100644
--- a/src/soc/intel/quark/include/soc/pci_devs.h
+++ b/src/soc/intel/quark/include/soc/pci_devs.h
@@ -18,9 +18,8 @@
 #ifndef _QUARK_PCI_DEVS_H_
 #define _QUARK_PCI_DEVS_H_
 
-#include <arch/io.h>
 #include <device/pci.h>
-#include <soc/QuarkNcSocId.h>
+#include <soc/reg_access.h>
 
 /* DEVICE 0 (Memory Controller Hub) */
 #define MC_BDF			PCI_DEV(PCI_BUS_NUMBER_QNC, MC_DEV, MC_FUN)
@@ -29,6 +28,8 @@
 #define I2CGPIO_DEVID		0x0934
 #define HSUART_DEVID		0x0936
 #define EHCI_DEVID		0x0939
+#define PCIE_PORT0_DEVID	0x11c3
+#define PCIE_PORT1_DEVID	0x11c4
 
 /* IO Fabric 1 */
 #define SIO1_DEV		0x14
@@ -45,6 +46,18 @@
 #define I2CGPIO_DEV_FUNC	PCI_DEVFN(I2CGPIO_DEV, I2CGPIO_FUNC)
 #define I2CGPIO_BDF	PCI_DEV(PCI_BUS_NUMBER_QNC, I2CGPIO_DEV, I2CGPIO_FUNC)
 
+/* PCIe Ports */
+#define PCIE_DEV		0x17
+#define PCIE_PORT0_DEV		PCIE_DEV
+#define PCIE_PORT0_FUNC		0
+#define PCIE_PORT0_DEV_FUNC	DEV_FUNC(PCIE_DEV, PCIE_PORT0_FUNC)
+#define PCIE_PORT0_BDF	PCI_DEV(PCI_BUS_NUMBER_QNC, PCIE_DEV, PCIE_PORT0_FUNC)
+
+#define PCIE_PORT1_DEV		PCIE_DEV
+#define PCIE_PORT1_FUNC		1
+#define PCIE_PORT1_DEV_FUNC	DEV_FUNC(PCIE_DEV,PCIE_PORT1_FUNC)
+#define PCIE_PORT1_BDF	PCI_DEV(PCI_BUS_NUMBER_QNC, PCIE_DEV, PCIE_PORT1_FUNC)
+
 /* Platform Controller Unit */
 #define LPC_DEV			PCI_DEVICE_NUMBER_QNC_LPC
 #define LPC_FUNC		PCI_FUNCTION_NUMBER_QNC_LPC
diff --git a/src/soc/intel/quark/include/soc/reg_access.h b/src/soc/intel/quark/include/soc/reg_access.h
index 66ab7b8621..580400c331 100644
--- a/src/soc/intel/quark/include/soc/reg_access.h
+++ b/src/soc/intel/quark/include/soc/reg_access.h
@@ -16,6 +16,9 @@
 #ifndef _QUARK_REG_ACCESS_H_
 #define _QUARK_REG_ACCESS_H_
 
+#define __SIMPLE_DEVICE__
+
+#include <arch/io.h>
 #include <delay.h>
 #include <fsp/util.h>
 #include <reg_script.h>
@@ -30,6 +33,8 @@ enum {
 	MICROSECOND_DELAY,
 	LEG_GPIO_REGS,
 	GPIO_REGS,
+	PCIE_AFE_REGS,
+	PCIE_RESET,
 };
 
 enum {
@@ -83,6 +88,31 @@ enum {
 #define REG_LEG_GPIO_XOR(reg_, value_) \
 	REG_LEG_GPIO_RXW(reg_, 0xffffffff, value_)
 
+/* PCIE AFE register access macros */
+#define REG_PCIE_AFE_ACCESS(cmd_, reg_, mask_, value_, timeout_) \
+	SOC_ACCESS(cmd_, reg_, REG_SCRIPT_SIZE_32, mask_, value_, timeout_, \
+		PCIE_AFE_REGS)
+#define REG_PCIE_AFE_READ(reg_) \
+	REG_PCIE_AFE_ACCESS(READ, reg_, 0, 0, 0)
+#define REG_PCIE_AFE_WRITE(reg_, value_) \
+	REG_PCIE_AFE_ACCESS(WRITE, reg_, 0, value_, 0)
+#define REG_PCIE_AFE_AND(reg_, value_) \
+	REG_PCIE_AFE_RMW(reg_, value_, 0)
+#define REG_PCIE_AFE_RMW(reg_, mask_, value_) \
+	REG_PCIE_AFE_ACCESS(RMW, reg_, mask_, value_, 0)
+#define REG_PCIE_AFE_RXW(reg_, mask_, value_) \
+	REG_PCIE_AFE_ACCESS(RXW, reg_, mask_, value_, 0)
+#define REG_PCIE_AFE_OR(reg_, value_) \
+	REG_PCIE_AFE_RMW(reg_, 0xffffffff, value_)
+#define REG_PCIE_AFE_POLL(reg_, mask_, value_, timeout_) \
+	REG_PCIE_AFE_ACCESS(POLL, reg_, mask_, value_, timeout_)
+#define REG_PCIE_AFE_XOR(reg_, value_) \
+	REG_PCIE_AFE_RXW(reg_, 0xffffffff, value_)
+
+/* PCIe reset */
+#define MAINBOARD_PCIE_RESET(pin_value_) \
+	SOC_ACCESS(WRITE, 0, REG_SCRIPT_SIZE_32, 1, pin_value_, 0, PCIE_RESET)
+
 /* RMU temperature register access macros */
 #define REG_RMU_TEMP_ACCESS(cmd_, reg_, mask_, value_, timeout_) \
 	SOC_ACCESS(cmd_, reg_, REG_SCRIPT_SIZE_32, mask_, value_, timeout_, \
@@ -152,6 +182,7 @@ enum {
 
 void *get_i2c_address(void);
 void mainboard_gpio_init(void);
+void mainboard_gpio_pcie_reset(uint32_t pin_value);
 void mcr_write(uint8_t opcode, uint8_t port, uint32_t reg_address);
 uint32_t mdr_read(void);
 void mdr_write(uint32_t value);
diff --git a/src/soc/intel/quark/include/soc/romstage.h b/src/soc/intel/quark/include/soc/romstage.h
index c344adac0a..3a9e7a8a2d 100644
--- a/src/soc/intel/quark/include/soc/romstage.h
+++ b/src/soc/intel/quark/include/soc/romstage.h
@@ -29,5 +29,6 @@ uint32_t port_reg_read(uint8_t port, uint32_t offset);
 void port_reg_write(uint8_t port, uint32_t offset, uint32_t value);
 void report_platform_info(void);
 int set_base_address_and_enable_uart(u8 bus, u8 dev, u8 func, u32 mmio_base);
+void pcie_init(void);
 
 #endif /* _QUARK_ROMSTAGE_H_ */
diff --git a/src/soc/intel/quark/reg_access.c b/src/soc/intel/quark/reg_access.c
index 4734135b2c..f7820e9f4c 100644
--- a/src/soc/intel/quark/reg_access.c
+++ b/src/soc/intel/quark/reg_access.c
@@ -15,10 +15,9 @@
 
 #define __SIMPLE_DEVICE__
 
-#include <arch/io.h>
 #include <console/console.h>
 #include <soc/pci_devs.h>
-#include <soc/reg_access.h>
+#include <soc/ramstage.h>
 
 static uint32_t *get_gpio_address(uint32_t reg_address)
 {
@@ -108,6 +107,24 @@ void reg_legacy_gpio_write(uint32_t reg_address, uint32_t value)
 	outl(value, get_legacy_gpio_address(reg_address));
 }
 
+static uint32_t reg_pcie_afe_read(uint32_t reg_address)
+{
+	/* Read the PCIE AFE register */
+	mea_write(reg_address);
+	mcr_write(QUARK_OPCODE_IO_READ, QUARK_SC_PCIE_AFE_SB_PORT_ID,
+		reg_address);
+	return mdr_read();
+}
+
+static void reg_pcie_afe_write(uint32_t reg_address, uint32_t value)
+{
+	/* Write the PCIE AFE register */
+	mea_write(reg_address);
+	mdr_write(value);
+	mcr_write(QUARK_OPCODE_IO_WRITE, QUARK_SC_PCIE_AFE_SB_PORT_ID,
+		reg_address);
+}
+
 uint32_t reg_rmu_temp_read(uint32_t reg_address)
 {
 	/* Read the RMU temperature register */
@@ -181,6 +198,10 @@ static uint64_t reg_read(struct reg_script_context *ctx)
 	case LEG_GPIO_REGS:
 		ctx->display_prefix = "Legacy GPIO: ";
 		value = reg_legacy_gpio_read(step->reg);
+
+	case PCIE_AFE_REGS:
+		ctx->display_prefix = "PCIe AFE: ";
+		value = reg_pcie_afe_read(step->reg);
 		break;
 
 	case RMU_TEMP_REGS:
@@ -223,6 +244,19 @@ static void reg_write(struct reg_script_context *ctx)
 		reg_legacy_gpio_write(step->reg, (uint32_t)step->value);
 		break;
 
+	case PCIE_AFE_REGS:
+		ctx->display_prefix = "PCIe AFE: ";
+		reg_pcie_afe_write(step->reg, (uint32_t)step->value);
+		break;
+
+	case PCIE_RESET:
+		if (ctx->display_features) {
+			ctx->display_prefix = "PCIe reset: ";
+			ctx->display_features &= ~REG_SCRIPT_DISPLAY_REGISTER;
+		}
+		mainboard_gpio_pcie_reset(step->value);
+		break;
+
 	case RMU_TEMP_REGS:
 		ctx->display_prefix = "RMU TEMP";
 		reg_rmu_temp_write(step->reg, (uint32_t)step->value);
diff --git a/src/soc/intel/quark/romstage/Makefile.inc b/src/soc/intel/quark/romstage/Makefile.inc
index fc7bd6aeb4..2f29b06a70 100644
--- a/src/soc/intel/quark/romstage/Makefile.inc
+++ b/src/soc/intel/quark/romstage/Makefile.inc
@@ -17,6 +17,7 @@ cpu_incs-y += $(src)/soc/intel/quark/romstage/esram_init.inc
 cpu_incs-y += $(src)/soc/intel/quark/romstage/cache_as_ram.inc
 
 romstage-y += mtrr.c
+romstage-y += pcie.c
 romstage-y += report_platform.c
 romstage-y += romstage.c
 romstage-$(CONFIG_ENABLE_BUILTIN_HSUART1) += uart.c
diff --git a/src/soc/intel/quark/romstage/pcie.c b/src/soc/intel/quark/romstage/pcie.c
new file mode 100644
index 0000000000..f2adc18e86
--- /dev/null
+++ b/src/soc/intel/quark/romstage/pcie.c
@@ -0,0 +1,109 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2016 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <console/console.h>
+#include <delay.h>
+#include <device/device.h>
+#include <device/pci_ids.h>
+#include <soc/pci_devs.h>
+#include <soc/reg_access.h>
+#include <soc/romstage.h>
+
+/* Minimum time in microseconds for assertion of PERST# signal */
+#define PCIEXP_PERST_MIN_ASSERT_US		100
+
+/* Microsecond delay post issuing common lane reset */
+#define PCIEXP_DELAY_US_POST_CMNRESET_RESET	1
+
+/* Microsecond delay to wait for PLL to lock */
+#define PCIEXP_DELAY_US_WAIT_PLL_LOCK		80
+
+/* Microsecond delay post issuing sideband interface reset */
+#define PCIEXP_DELAY_US_POST_SBI_RESET		20
+
+/* Microsecond delay post deasserting PERST# */
+#define PCIEXP_DELAY_US_POST_PERST_DEASSERT	10
+
+const struct reg_script pcie_init_script[] = {
+	/* Assert PCIe reset# */
+	MAINBOARD_PCIE_RESET(0),
+
+	/* PHY Common lane reset */
+	REG_SOC_UNIT_OR(QUARK_SCSS_SOC_UNIT_SOCCLKEN_CONFIG,
+		SOCCLKEN_CONFIG_PHY_I_CMNRESET_L),
+
+	/* Wait post common lane reset */
+	TIME_DELAY_USEC(PCIEXP_DELAY_US_POST_CMNRESET_RESET),
+
+	/* PHY Sideband interface reset.
+	 * Controller main reset
+	 */
+	REG_SOC_UNIT_OR(QUARK_SCSS_SOC_UNIT_SOCCLKEN_CONFIG,
+		SOCCLKEN_CONFIG_SBI_RST_100_CORE_B
+		| SOCCLKEN_CONFIG_PHY_I_SIDE_RST_L),
+	TIME_DELAY_USEC(PCIEXP_DELAY_US_WAIT_PLL_LOCK),
+
+	/* Controller sideband interface reset */
+	REG_SOC_UNIT_OR(QUARK_SCSS_SOC_UNIT_SOCCLKEN_CONFIG,
+		SOCCLKEN_CONFIG_SBI_BB_RST_B),
+
+	/* Wait post sideband interface reset */
+	TIME_DELAY_USEC(PCIEXP_DELAY_US_POST_SBI_RESET),
+
+	/* Deassert PCIe reset# */
+	MAINBOARD_PCIE_RESET(1),
+
+	/* Wait post de assert PERST#. */
+	TIME_DELAY_USEC(PCIEXP_DELAY_US_POST_PERST_DEASSERT),
+
+	/* Controller primary interface reset */
+	REG_SOC_UNIT_OR(QUARK_SCSS_SOC_UNIT_SOCCLKEN_CONFIG,
+		SOCCLKEN_CONFIG_BB_RST_B),
+
+	/* Set the mixer load resistance */
+	REG_PCIE_AFE_AND(QUARK_PCIE_AFE_PCIE_RXPICTRL0_L0,
+		OCFGPIMIXLOAD_1_0_MASK),
+	REG_PCIE_AFE_AND(QUARK_PCIE_AFE_PCIE_RXPICTRL0_L1,
+		OCFGPIMIXLOAD_1_0_MASK),
+	REG_SCRIPT_END
+};
+
+static const struct reg_script pcie_bus_init_script[] = {
+	/* Setup Message Bus Idle Counter (SBIC) values */
+	REG_PCI_RMW8(R_QNC_PCIE_IOSFSBCTL, ~B_QNC_PCIE_IOSFSBCTL_SBIC_MASK,
+		V_PCIE_ROOT_PORT_SBIC_VALUE),
+	REG_PCI_READ8(R_QNC_PCIE_IOSFSBCTL),
+
+	/* Set the IPF bit in MCR2 */
+	REG_PCI_OR32(R_QNC_PCIE_MPC2, B_QNC_PCIE_MPC2_IPF),
+	REG_PCI_READ32(R_QNC_PCIE_MPC2),
+
+	/* Set up the Posted and Non Posted Request sizes for PCIe */
+	REG_PCI_RMW32(R_QNC_PCIE_CCFG, ~B_QNC_PCIE_CCFG_UPSD,
+		(B_QNC_PCIE_CCFG_UNRS | B_QNC_PCIE_CCFG_UPRS)),
+	REG_PCI_READ32(R_QNC_PCIE_CCFG),
+	REG_SCRIPT_END
+};
+
+void pcie_init(void)
+{
+	/* Initialize the PCIe bridges */
+	printk(BIOS_DEBUG, "Initializing PCIe controllers\n");
+	reg_script_run(pcie_init_script);
+	printk(BIOS_DEBUG, "Initializing PCIe bus 0\n");
+	reg_script_run_on_dev(PCIE_PORT0_BDF, pcie_bus_init_script);
+	printk(BIOS_DEBUG, "Initializing PCIe bus 1\n");
+	reg_script_run_on_dev(PCIE_PORT1_BDF, pcie_bus_init_script);
+}
diff --git a/src/soc/intel/quark/romstage/romstage.c b/src/soc/intel/quark/romstage/romstage.c
index 2f16c5f37a..4ed5863179 100644
--- a/src/soc/intel/quark/romstage/romstage.c
+++ b/src/soc/intel/quark/romstage/romstage.c
@@ -125,6 +125,9 @@ void soc_after_ram_init(struct romstage_params *params)
 
 	/* Display the DRAM data */
 	hexdump((void *)0x000ffff0, 0x10);
+
+	/* Initialize the PCIe bridges */
+	pcie_init();
 }
 
 void soc_display_memory_init_params(const MEMORY_INIT_UPD *old,