Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a28aad66 authored by Stephen Boyd's avatar Stephen Boyd Committed by Greg Kroah-Hartman
Browse files

firmware: coreboot: Collapse platform drivers into bus core 



The DT based and ACPI based platform drivers here do the same thing; map
some memory and hand it over to the coreboot bus to populate devices.
The only major difference is that the DT based driver doesn't map the
coreboot table header to figure out how large of a region to map for the
whole coreboot table and it uses of_iomap() instead of ioremap_cache().
A cached or non-cached mapping shouldn't matter here and mapping some
smaller region first before mapping the whole table is just more work
but should be OK. In the end, we can remove two files and combine the
code all in one place making it easier to reason about things.

We leave the old Kconfigs in place for a little while longer but make
them hidden and select the previously hidden config option. This way
users can upgrade without having to know to reselect this config in the
future. Later on we can remove the old hidden configs.

Cc: Wei-Ning Huang <wnhuang@chromium.org>
Cc: Julius Werner <jwerner@chromium.org>
Cc: Brian Norris <briannorris@chromium.org>
Cc: Samuel Holland <samuel@sholland.org>
Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarJulius Werner <jwerner@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b81e3140

drivers/firmware/google/Kconfig

+10 −16
Original line number Diff line number Diff line
@@ -19,28 +19,22 @@ config GOOGLE_SMI 
	  variables.



config GOOGLE_COREBOOT_TABLE

	tristate

	depends on GOOGLE_COREBOOT_TABLE_ACPI || GOOGLE_COREBOOT_TABLE_OF



config GOOGLE_COREBOOT_TABLE_ACPI

	tristate "Coreboot Table Access - ACPI"

	depends on ACPI

	select GOOGLE_COREBOOT_TABLE

	tristate "Coreboot Table Access"

	depends on ACPI || OF

	help

	  This option enables the coreboot_table module, which provides other

	  firmware modules to access to the coreboot table. The coreboot table

	  pointer is accessed through the ACPI "GOOGCB00" object.

	  firmware modules access to the coreboot table. The coreboot table

	  pointer is accessed through the ACPI "GOOGCB00" object or the

	  device tree node /firmware/coreboot.

	  If unsure say N.



config GOOGLE_COREBOOT_TABLE_ACPI

	tristate

	select GOOGLE_COREBOOT_TABLE



config GOOGLE_COREBOOT_TABLE_OF

	tristate "Coreboot Table Access - Device Tree"

	depends on OF

	tristate

	select GOOGLE_COREBOOT_TABLE

	help

	  This option enable the coreboot_table module, which provide other

	  firmware modules to access coreboot table. The coreboot table pointer

	  is accessed through the device tree node /firmware/coreboot.

	  If unsure say N.



config GOOGLE_MEMCONSOLE

	tristate

drivers/firmware/google/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 


obj-$(CONFIG_GOOGLE_SMI)		+= gsmi.o

obj-$(CONFIG_GOOGLE_COREBOOT_TABLE)        += coreboot_table.o

obj-$(CONFIG_GOOGLE_COREBOOT_TABLE_ACPI)   += coreboot_table-acpi.o

obj-$(CONFIG_GOOGLE_COREBOOT_TABLE_OF)     += coreboot_table-of.o

obj-$(CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT)  += framebuffer-coreboot.o

obj-$(CONFIG_GOOGLE_MEMCONSOLE)            += memconsole.o

obj-$(CONFIG_GOOGLE_MEMCONSOLE_COREBOOT)   += memconsole-coreboot.o

drivers/firmware/google/coreboot_table-acpi.c

deleted100644 → 0
+0 −88
Original line number Diff line number Diff line 
/*

 * coreboot_table-acpi.c

 *

 * Using ACPI to locate Coreboot table and provide coreboot table access.

 *

 * Copyright 2017 Google Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License v2.0 as published by

 * the Free Software Foundation.

 *

 * 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 <linux/acpi.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/platform_device.h>



#include "coreboot_table.h"



static int coreboot_table_acpi_probe(struct platform_device *pdev)

{

	phys_addr_t phyaddr;

	resource_size_t len;

	struct coreboot_table_header __iomem *header = NULL;

	struct resource *res;

	void __iomem *ptr = NULL;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -EINVAL;



	len = resource_size(res);

	if (!res->start || !len)

		return -EINVAL;



	phyaddr = res->start;

	header = ioremap_cache(phyaddr, sizeof(*header));

	if (header == NULL)

		return -ENOMEM;



	ptr = ioremap_cache(phyaddr,

			    header->header_bytes + header->table_bytes);

	iounmap(header);

	if (!ptr)

		return -ENOMEM;



	return coreboot_table_init(&pdev->dev, ptr);

}



static int coreboot_table_acpi_remove(struct platform_device *pdev)

{

	return coreboot_table_exit();

}



static const struct acpi_device_id cros_coreboot_acpi_match[] = {

	{ "GOOGCB00", 0 },

	{ "BOOT0000", 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, cros_coreboot_acpi_match);



static struct platform_driver coreboot_table_acpi_driver = {

	.probe = coreboot_table_acpi_probe,

	.remove = coreboot_table_acpi_remove,

	.driver = {

		.name = "coreboot_table_acpi",

		.acpi_match_table = ACPI_PTR(cros_coreboot_acpi_match),

	},

};



static int __init coreboot_table_acpi_init(void)

{

	return platform_driver_register(&coreboot_table_acpi_driver);

}



module_init(coreboot_table_acpi_init);



MODULE_AUTHOR("Google, Inc.");

MODULE_LICENSE("GPL");

drivers/firmware/google/coreboot_table-of.c

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
/*

 * coreboot_table-of.c

 *

 * Coreboot table access through open firmware.

 *

 * Copyright 2017 Google Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License v2.0 as published by

 * the Free Software Foundation.

 *

 * 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 <linux/device.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>



#include "coreboot_table.h"



static int coreboot_table_of_probe(struct platform_device *pdev)

{

	struct device_node *fw_dn = pdev->dev.of_node;

	void __iomem *ptr;



	ptr = of_iomap(fw_dn, 0);

	if (!ptr)

		return -ENOMEM;



	return coreboot_table_init(&pdev->dev, ptr);

}



static int coreboot_table_of_remove(struct platform_device *pdev)

{

	return coreboot_table_exit();

}



static const struct of_device_id coreboot_of_match[] = {

	{ .compatible = "coreboot" },

	{}

};

MODULE_DEVICE_TABLE(of, coreboot_of_match);



static struct platform_driver coreboot_table_of_driver = {

	.probe = coreboot_table_of_probe,

	.remove = coreboot_table_of_remove,

	.driver = {

		.name = "coreboot_table_of",

		.of_match_table = coreboot_of_match,

	},

};

module_platform_driver(coreboot_table_of_driver);



MODULE_AUTHOR("Google, Inc.");

MODULE_LICENSE("GPL");

drivers/firmware/google/coreboot_table.c

+62 −4
Original line number Diff line number Diff line
@@ -16,12 +16,15 @@ 
 * GNU General Public License for more details.

 */



#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/slab.h>



#include "coreboot_table.h"
@@ -91,7 +94,7 @@ void coreboot_driver_unregister(struct coreboot_driver *driver) 
}

EXPORT_SYMBOL(coreboot_driver_unregister);



int coreboot_table_init(struct device *dev, void __iomem *ptr)

static int coreboot_table_init(struct device *dev, void __iomem *ptr)

{

	int i, ret;

	void *ptr_entry;
@@ -144,9 +147,38 @@ int coreboot_table_init(struct device *dev, void __iomem *ptr) 
	iounmap(ptr);

	return ret;

}

EXPORT_SYMBOL(coreboot_table_init);



int coreboot_table_exit(void)

static int coreboot_table_probe(struct platform_device *pdev)

{

	phys_addr_t phyaddr;

	resource_size_t len;

	struct coreboot_table_header __iomem *header = NULL;

	struct resource *res;

	void __iomem *ptr = NULL;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -EINVAL;



	len = resource_size(res);

	if (!res->start || !len)

		return -EINVAL;



	phyaddr = res->start;

	header = ioremap_cache(phyaddr, sizeof(*header));

	if (header == NULL)

		return -ENOMEM;



	ptr = ioremap_cache(phyaddr,

			    header->header_bytes + header->table_bytes);

	iounmap(header);

	if (!ptr)

		return -ENOMEM;



	return coreboot_table_init(&pdev->dev, ptr);

}



static int coreboot_table_remove(struct platform_device *pdev)

{

	if (ptr_header) {

		bus_unregister(&coreboot_bus_type);
@@ -155,7 +187,33 @@ int coreboot_table_exit(void) 


	return 0;

}

EXPORT_SYMBOL(coreboot_table_exit);



#ifdef CONFIG_ACPI

static const struct acpi_device_id cros_coreboot_acpi_match[] = {

	{ "GOOGCB00", 0 },

	{ "BOOT0000", 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, cros_coreboot_acpi_match);

#endif



#ifdef CONFIG_OF

static const struct of_device_id coreboot_of_match[] = {

	{ .compatible = "coreboot" },

	{}

};

MODULE_DEVICE_TABLE(of, coreboot_of_match);

#endif



static struct platform_driver coreboot_table_driver = {

	.probe = coreboot_table_probe,

	.remove = coreboot_table_remove,

	.driver = {

		.name = "coreboot_table",

		.acpi_match_table = ACPI_PTR(cros_coreboot_acpi_match),

		.of_match_table = of_match_ptr(coreboot_of_match),

	},

};

module_platform_driver(coreboot_table_driver);

MODULE_AUTHOR("Google, Inc.");

MODULE_LICENSE("GPL");