[coreboot-gerrit] Change in coreboot[master]: soc/intel/common: Add option to pass SoC IO resource
Subrata Banik (Code Review)
gerrit at coreboot.org
Wed Jan 10 07:25:54 CET 2018
Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/23201
Change subject: soc/intel/common: Add option to pass SoC IO resource
......................................................................
soc/intel/common: Add option to pass SoC IO resource
This patch ensures common block has option to reserve IO resources
based on SOC requirements. Also add pch_lpc_ prefix to maintain
same function nomenclature across all intel common block.
Change-Id: Ic00af688104bcea1aff06be6cbb20208a60e5f1d
Signed-off-by: Subrata Banik <subrata.banik at intel.com>
---
M src/soc/intel/apollolake/lpc.c
M src/soc/intel/cannonlake/lpc.c
M src/soc/intel/common/block/include/intelblocks/lpc_lib.h
M src/soc/intel/common/block/lpc/lpc.c
M src/soc/intel/skylake/lpc.c
5 files changed, 51 insertions(+), 26 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/23201/1
diff --git a/src/soc/intel/apollolake/lpc.c b/src/soc/intel/apollolake/lpc.c
index 95b8bf5..c52aa59 100644
--- a/src/soc/intel/apollolake/lpc.c
+++ b/src/soc/intel/apollolake/lpc.c
@@ -82,7 +82,7 @@
gpio_configure_pads(lpc_gpios, ARRAY_SIZE(lpc_gpios));
}
-void lpc_init(struct device *dev)
+void lpc_soc_init(struct device *dev)
{
const struct soc_intel_apollolake_config *cfg;
diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
index e906d99..23e7f6a 100644
--- a/src/soc/intel/cannonlake/lpc.c
+++ b/src/soc/intel/cannonlake/lpc.c
@@ -182,7 +182,7 @@
itss_clock_gate_8254();
}
-void lpc_init(struct device *dev)
+void lpc_soc_init(struct device *dev)
{
/* Legacy initialization */
isa_dma_init();
diff --git a/src/soc/intel/common/block/include/intelblocks/lpc_lib.h b/src/soc/intel/common/block/include/intelblocks/lpc_lib.h
index 2b525ca..6a9ef02 100644
--- a/src/soc/intel/common/block/include/intelblocks/lpc_lib.h
+++ b/src/soc/intel/common/block/include/intelblocks/lpc_lib.h
@@ -71,7 +71,9 @@
bool lpc_fits_fixed_mmio_window(uintptr_t base, size_t size);
/* Init SoC Spcific LPC features. Common definition will be weak and
each soc will need to define the init. */
-void lpc_init(struct device *dev);
+void lpc_soc_init(struct device *dev);
+/* Fill up LPC IO resource structure inside SoC directory */
+void pch_lpc_soc_get_io_resources(void);
/* Init LPC GPIO pads */
void lpc_configure_pads(void);
/* Get SoC speicific MMIO ranges */
@@ -102,5 +104,8 @@
uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES]);
/* Mirror generic IO decoder range register settings into DMI PCR. */
void soc_setup_dmi_pcr_io_dec(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES]);
+/* Add resource into LPC PCI device space */
+void pch_lpc_add_new_resource(struct device *dev, uint8_t offset,
+ uintptr_t base, size_t size, unsigned long flags);
#endif /* _SOC_COMMON_BLOCK_LPC_LIB_H_ */
diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c
index 6b886e3..1a5bcb2 100644
--- a/src/soc/intel/common/block/lpc/lpc.c
+++ b/src/soc/intel/common/block/lpc/lpc.c
@@ -21,32 +21,52 @@
#include <intelblocks/lpc_lib.h>
#include <soc/pm.h>
+/* SoC overrides */
+
/* Common weak definition, needs to be implemented in each soc LPC driver. */
-__attribute__((weak)) void lpc_init(struct device *dev) { /* no-op */ }
-
-static void soc_lpc_add_io_resources(device_t dev)
+__attribute__((weak)) void lpc_soc_init(struct device *dev)
{
- struct resource *res;
-
- /* Add the default claimed legacy IO range for the LPC device. */
- res = new_resource(dev, 0);
- res->base = 0;
- res->size = 0x1000;
- res->flags = IORESOURCE_IO | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
+ /* no-op */
}
-static void soc_lpc_read_resources(device_t dev)
+/* Fill up LPC IO resource structure inside SoC directory */
+__attribute__((weak)) void pch_lpc_soc_get_io_resources(void)
+{
+ /* no-op */
+}
+
+void pch_lpc_add_new_resource(struct device *dev, uint8_t offset,
+ uintptr_t base, size_t size, unsigned long flags)
+{
+ struct resource *res;
+ res = new_resource(dev, offset);
+ res->base = base;
+ res->size = size;
+ res->flags = flags;
+}
+
+static void pch_lpc_add_io_resources(device_t dev)
+{
+ /* Add the default claimed legacy IO range for the LPC device. */
+ pch_lpc_add_new_resource(dev, 0, 0, 0x1000, IORESOURCE_IO |
+ IORESOURCE_ASSIGNED | IORESOURCE_FIXED);
+
+ /* SoC IO resource overrides */
+ pch_lpc_soc_get_io_resources();
+}
+
+static void pch_lpc_read_resources(device_t dev)
{
/* Get the PCI resources of this device. */
pci_dev_read_resources(dev);
/* Add IO resources to LPC. */
- soc_lpc_add_io_resources(dev);
+ pch_lpc_add_io_resources(dev);
}
-static void set_child_resources(struct device *dev);
+static void pch_lpc_set_child_resources(struct device *dev);
-static void loop_resources(struct device *dev)
+static void pch_lpc_loop_resources(struct device *dev)
{
struct resource *res;
@@ -62,39 +82,39 @@
lpc_open_mmio_window(res->base, res->size);
}
}
- set_child_resources(dev);
+ pch_lpc_set_child_resources(dev);
}
/*
* Loop through all the child devices' resources, and open up windows to the
* LPC bus, as appropriate.
*/
-static void set_child_resources(struct device *dev)
+static void pch_lpc_set_child_resources(struct device *dev)
{
struct bus *link;
struct device *child;
for (link = dev->link_list; link; link = link->next) {
for (child = link->children; child; child = child->sibling)
- loop_resources(child);
+ pch_lpc_loop_resources(child);
}
}
-static void set_resources(device_t dev)
+static void pch_lpc_set_resources(device_t dev)
{
pci_dev_set_resources(dev);
/* Now open up windows to devices which have declared resources. */
- set_child_resources(dev);
+ pch_lpc_set_child_resources(dev);
}
static struct device_operations device_ops = {
- .read_resources = soc_lpc_read_resources,
- .set_resources = set_resources,
+ .read_resources = pch_lpc_read_resources,
+ .set_resources = pch_lpc_set_resources,
.enable_resources = pci_dev_enable_resources,
.write_acpi_tables = southbridge_write_acpi_tables,
.acpi_inject_dsdt_generator = southbridge_inject_dsdt,
- .init = lpc_init,
+ .init = lpc_soc_init,
.scan_bus = scan_lpc_bus,
.ops_pci = &pci_dev_ops_pci,
};
diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c
index 9cd450b..95f78bf 100644
--- a/src/soc/intel/skylake/lpc.c
+++ b/src/soc/intel/skylake/lpc.c
@@ -115,7 +115,7 @@
itss_clock_gate_8254();
}
-void lpc_init(struct device *dev)
+void lpc_soc_init(struct device *dev)
{
/* Legacy initialization */
isa_dma_init();
--
To view, visit https://review.coreboot.org/23201
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic00af688104bcea1aff06be6cbb20208a60e5f1d
Gerrit-Change-Number: 23201
Gerrit-PatchSet: 1
Gerrit-Owner: Subrata Banik <subrata.banik at intel.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180110/77702c92/attachment-0001.html>
More information about the coreboot-gerrit
mailing list