[coreboot-gerrit] Patch set updated for coreboot: soc/intel/apollolake: add code to disable unused device
Jagadish Krishnamoorthy (jagadish.krishnamoorthy@intel.com)
gerrit at coreboot.org
Fri Jun 24 22:23:02 CEST 2016
Jagadish Krishnamoorthy (jagadish.krishnamoorthy at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15337
-gerrit
commit 57bd9a9e1a593f32ade10d8b17dd845aeaa82c17
Author: Jagadish Krishnamoorthy <jagadish.krishnamoorthy at intel.com>
Date: Wed Jun 22 18:32:17 2016 -0700
soc/intel/apollolake: add code to disable unused device
Parse the devicetree and pass the unused device to fsp
for disabling the device function.
BRANCH=none
BUG=chrome-os-partner:54325
TEST=device off in devicetree should disable the device.
Change-Id: I784b72a43fda13aa17634bf680205ab2d36e8d09
Signed-off-by: Jagadish Krishnamoorthy <jagadish.krishnamoorthy at intel.com>
---
src/soc/intel/apollolake/chip.c | 116 ++++++++++++++++++++++++
src/soc/intel/apollolake/include/soc/pci_devs.h | 29 ++++++
2 files changed, 145 insertions(+)
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index dd4a0a5..d1b2229 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -95,6 +95,119 @@ static void soc_final(void *data)
rdev_munmap(&vbt_rdev, vbt);
}
+static void disable_dev(struct device *dev, struct FSP_S_CONFIG *silconfig) {
+
+ switch (dev->path.pci.devfn) {
+ case ISH_DEVFN:
+ silconfig->IshEnable = 0;
+ break;
+ case SATA_DEVFN:
+ silconfig->EnableSata = 0;
+ break;
+ case PCIEA0_DEVFN:
+ silconfig->PcieRootPortEn[0] = 0;
+ break;
+ case PCIEA1_DEVFN:
+ silconfig->PcieRootPortEn[1] = 0;
+ break;
+ case PCIEA2_DEVFN:
+ silconfig->PcieRootPortEn[2] = 0;
+ break;
+ case PCIEA3_DEVFN:
+ silconfig->PcieRootPortEn[3] = 0;
+ break;
+ case PCIEB0_DEVFN:
+ silconfig->PcieRootPortEn[4] = 0;
+ break;
+ case PCIEB1_DEVFN:
+ silconfig->PcieRootPortEn[5] = 0;
+ break;
+ case XHCI_DEVFN:
+ silconfig->Usb30Mode = 0;
+ break;
+ case XDCI_DEVFN:
+ silconfig->UsbOtg = 0;
+ break;
+ case I2C0_DEVFN:
+ silconfig->I2c0Enable = 0;
+ break;
+ case I2C1_DEVFN:
+ silconfig->I2c1Enable = 0;
+ break;
+ case I2C2_DEVFN:
+ silconfig->I2c2Enable = 0;
+ break;
+ case I2C3_DEVFN:
+ silconfig->I2c3Enable = 0;
+ break;
+ case I2C4_DEVFN:
+ silconfig->I2c4Enable = 0;
+ break;
+ case I2C5_DEVFN:
+ silconfig->I2c5Enable = 0;
+ break;
+ case I2C6_DEVFN:
+ silconfig->I2c6Enable = 0;
+ break;
+ case I2C7_DEVFN:
+ silconfig->I2c7Enable = 0;
+ break;
+ case UART0_DEVFN:
+ silconfig->Hsuart0Enable = 0;
+ break;
+ case UART1_DEVFN:
+ silconfig->Hsuart1Enable = 0;
+ break;
+ case UART2_DEVFN:
+ silconfig->Hsuart2Enable = 0;
+ break;
+ case UART3_DEVFN:
+ silconfig->Hsuart3Enable = 0;
+ break;
+ case SPI0_DEVFN:
+ silconfig->Spi0Enable = 0;
+ break;
+ case SPI1_DEVFN:
+ silconfig->Spi1Enable = 0;
+ break;
+ case SPI2_DEVFN:
+ silconfig->Spi2Enable = 0;
+ break;
+ case SDCARD_DEVFN:
+ silconfig->SdcardEnabled = 0;
+ break;
+ case EMMC_DEVFN:
+ silconfig->eMMCEnabled = 0;
+ break;
+ case SDIO_DEVFN:
+ silconfig->SdioEnabled = 0;
+ break;
+ case SMBUS_DEVFN:
+ silconfig->SmbusEnable = 0;
+ break;
+ default:
+ printk(BIOS_WARNING, "PCI:%02x.%01x: Could not disable the device\n",
+ PCI_SLOT(dev->path.pci.devfn),
+ PCI_FUNC(dev->path.pci.devfn));
+ break;
+ }
+}
+
+static void parse_devicetree(struct FSP_S_CONFIG *silconfig)
+{
+ struct device *dev = dev_find_slot(0, NB_DEVFN);
+
+ if (!dev) {
+ printk(BIOS_ERR, "Could not find root device\n");
+ return;
+ }
+ /* Only disable bus 0 devices. */
+ for (dev = dev->bus->children; dev; dev = dev->sibling) {
+ if (!dev->enabled)
+ disable_dev(dev, silconfig);
+ }
+}
+
void platform_fsp_silicon_init_params_cb(struct FSPS_UPD *silupd)
{
struct FSP_S_CONFIG *silconfig = &silupd->FspsConfig;
@@ -111,6 +224,9 @@ void platform_fsp_silicon_init_params_cb(struct FSPS_UPD *silupd)
cfg = dev->chip_info;
+ /* Parse device tree and disable unused device*/
+ parse_devicetree(silconfig);
+
silconfig->PcieRpClkReqNumber[0] = cfg->pcie_rp0_clkreq_pin;
silconfig->PcieRpClkReqNumber[1] = cfg->pcie_rp1_clkreq_pin;
silconfig->PcieRpClkReqNumber[2] = cfg->pcie_rp2_clkreq_pin;
diff --git a/src/soc/intel/apollolake/include/soc/pci_devs.h b/src/soc/intel/apollolake/include/soc/pci_devs.h
index d11b9a7..fc046d1 100644
--- a/src/soc/intel/apollolake/include/soc/pci_devs.h
+++ b/src/soc/intel/apollolake/include/soc/pci_devs.h
@@ -47,4 +47,33 @@
#define SPI_DEV PCI_DEV(0, 0xd, 2)
#define LPC_DEV PCI_DEV(0, 0x1f, 0)
+#define ISH_DEVFN PCI_DEVFN(0x11, 0)
+#define SATA_DEVFN PCI_DEVFN(0x12, 0)
+#define PCIEA0_DEVFN PCI_DEVFN(0x13, 0)
+#define PCIEA1_DEVFN PCI_DEVFN(0x13, 1)
+#define PCIEA2_DEVFN PCI_DEVFN(0x13, 2)
+#define PCIEA3_DEVFN PCI_DEVFN(0x13, 3)
+#define PCIEB0_DEVFN PCI_DEVFN(0x14, 0)
+#define PCIEB1_DEVFN PCI_DEVFN(0x14, 1)
+#define XHCI_DEVFN PCI_DEVFN(0x15, 0)
+#define XDCI_DEVFN PCI_DEVFN(0x15, 1)
+#define I2C0_DEVFN PCI_DEVFN(0x16, 0)
+#define I2C1_DEVFN PCI_DEVFN(0x16, 1)
+#define I2C2_DEVFN PCI_DEVFN(0x16, 2)
+#define I2C3_DEVFN PCI_DEVFN(0x16, 3)
+#define I2C4_DEVFN PCI_DEVFN(0x17, 0)
+#define I2C5_DEVFN PCI_DEVFN(0x17, 1)
+#define I2C6_DEVFN PCI_DEVFN(0x17, 2)
+#define I2C7_DEVFN PCI_DEVFN(0x17, 3)
+#define UART0_DEVFN PCI_DEVFN(0x18, 0)
+#define UART1_DEVFN PCI_DEVFN(0x18, 1)
+#define UART2_DEVFN PCI_DEVFN(0x18, 2)
+#define UART3_DEVFN PCI_DEVFN(0x18, 3)
+#define SPI0_DEVFN PCI_DEVFN(0x19, 0)
+#define SPI1_DEVFN PCI_DEVFN(0x19, 1)
+#define SPI2_DEVFN PCI_DEVFN(0x19, 2)
+#define SDCARD_DEVFN PCI_DEVFN(0x1b, 0)
+#define EMMC_DEVFN PCI_DEVFN(0x1c, 0)
+#define SDIO_DEVFN PCI_DEVFN(0x1e, 0)
+#define SMBUS_DEVFN PCI_DEVFN(0x1f, 1)
#endif
More information about the coreboot-gerrit
mailing list