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

Commit caf5aa19 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-scan', 'acpi-osl' and 'acpi-apei' 

* acpi-scan:
  ACPI / scan: AMBA bus probing support
  ACPI: introduce a function to find the first physical device

* acpi-osl:
  ACPI / OSL: Add support to install tables via initrd
  ACPI / OSL: Clean up initrd table override code

* acpi-apei:
  ACPI / APEI: ERST: Fixed leaked resources in erst_init
  ACPI / APEI: Fix leaked resources
parents 255a60fc 6ce2e188 c85cc817 3a03d126

drivers/acpi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ acpi-y += pci_root.o pci_link.o pci_irq.o 
acpi-y				+= acpi_lpss.o acpi_apd.o

acpi-y				+= acpi_platform.o

acpi-y				+= acpi_pnp.o

acpi-$(CONFIG_ARM_AMBA)	+= acpi_amba.o

acpi-y				+= int340x_thermal.o

acpi-y				+= power.o

acpi-y				+= event.o

drivers/acpi/acpi_amba.c

0 → 100644
+122 −0
Original line number Diff line number Diff line 


/*

 * ACPI support for platform bus type.

 *

 * Copyright (C) 2015, Linaro Ltd

 * Author: Graeme Gregory <graeme.gregory@linaro.org>

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/acpi.h>

#include <linux/amba/bus.h>

#include <linux/clkdev.h>

#include <linux/clk-provider.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/ioport.h>

#include <linux/kernel.h>

#include <linux/module.h>



#include "internal.h"



static const struct acpi_device_id amba_id_list[] = {

	{"ARMH0061", 0}, /* PL061 GPIO Device */

	{"", 0},

};



static void amba_register_dummy_clk(void)

{

	static struct clk *amba_dummy_clk;



	/* If clock already registered */

	if (amba_dummy_clk)

		return;



	amba_dummy_clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL,

						CLK_IS_ROOT, 0);

	clk_register_clkdev(amba_dummy_clk, "apb_pclk", NULL);

}



static int amba_handler_attach(struct acpi_device *adev,

				const struct acpi_device_id *id)

{

	struct amba_device *dev;

	struct resource_entry *rentry;

	struct list_head resource_list;

	bool address_found = false;

	int irq_no = 0;

	int ret;



	/* If the ACPI node already has a physical device attached, skip it. */

	if (adev->physical_node_count)

		return 0;



	dev = amba_device_alloc(dev_name(&adev->dev), 0, 0);

	if (!dev) {

		dev_err(&adev->dev, "%s(): amba_device_alloc() failed\n",

			__func__);

		return -ENOMEM;

	}



	INIT_LIST_HEAD(&resource_list);

	ret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);

	if (ret < 0)

		goto err_free;



	list_for_each_entry(rentry, &resource_list, node) {

		switch (resource_type(rentry->res)) {

		case IORESOURCE_MEM:

			if (!address_found) {

				dev->res = *rentry->res;

				address_found = true;

			}

			break;

		case IORESOURCE_IRQ:

			if (irq_no < AMBA_NR_IRQS)

				dev->irq[irq_no++] = rentry->res->start;

			break;

		default:

			dev_warn(&adev->dev, "Invalid resource\n");

			break;

		}

	}



	acpi_dev_free_resource_list(&resource_list);



	/*

	 * If the ACPI node has a parent and that parent has a physical device

	 * attached to it, that physical device should be the parent of

	 * the amba device we are about to create.

	 */

	if (adev->parent)

		dev->dev.parent = acpi_get_first_physical_node(adev->parent);



	ACPI_COMPANION_SET(&dev->dev, adev);



	ret = amba_device_add(dev, &iomem_resource);

	if (ret) {

		dev_err(&adev->dev, "%s(): amba_device_add() failed (%d)\n",

		       __func__, ret);

		goto err_free;

	}



	return 1;



err_free:

	amba_device_put(dev);

	return ret;

}



static struct acpi_scan_handler amba_handler = {

	.ids = amba_id_list,

	.attach = amba_handler_attach,

};



void __init acpi_amba_init(void)

{

	amba_register_dummy_clk();

	acpi_scan_add_handler(&amba_handler);

}

drivers/acpi/acpi_platform.c

+2 −17
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ static const struct acpi_device_id forbidden_id_list[] = { 
struct platform_device *acpi_create_platform_device(struct acpi_device *adev)

{

	struct platform_device *pdev = NULL;

	struct acpi_device *acpi_parent;

	struct platform_device_info pdevinfo;

	struct resource_entry *rentry;

	struct list_head resource_list;
@@ -82,22 +81,8 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) 
	 * attached to it, that physical device should be the parent of the

	 * platform device we are about to create.

	 */

	pdevinfo.parent = NULL;

	acpi_parent = adev->parent;

	if (acpi_parent) {

		struct acpi_device_physical_node *entry;

		struct list_head *list;



		mutex_lock(&acpi_parent->physical_node_lock);

		list = &acpi_parent->physical_node_list;

		if (!list_empty(list)) {

			entry = list_first_entry(list,

					struct acpi_device_physical_node,

					node);

			pdevinfo.parent = entry->dev;

		}

		mutex_unlock(&acpi_parent->physical_node_lock);

	}

	pdevinfo.parent = adev->parent ?

		acpi_get_first_physical_node(adev->parent) : NULL;

	pdevinfo.name = dev_name(&adev->dev);

	pdevinfo.id = -1;

	pdevinfo.res = resources;

drivers/acpi/apei/apei-base.c

+4 −2
Original line number Diff line number Diff line
@@ -536,7 +536,8 @@ int apei_resources_request(struct apei_resources *resources, 
		goto err_unmap_ioport;

	}



	return 0;

	goto arch_res_fini;



err_unmap_ioport:

	list_for_each_entry(res, &resources->ioport, list) {

		if (res == res_bak)
@@ -551,6 +552,7 @@ int apei_resources_request(struct apei_resources *resources, 
		release_mem_region(res->start, res->end - res->start);

	}

arch_res_fini:

	if (arch_apei_filter_addr)

		apei_resources_fini(&arch_res);

nvs_res_fini:

	apei_resources_fini(&nvs_resources);

drivers/acpi/apei/erst.c

+3 −0
Original line number Diff line number Diff line
@@ -1207,6 +1207,9 @@ static int __init erst_init(void) 
		"Failed to allocate %lld bytes for persistent store error log.\n",

		erst_erange.size);



	/* Cleanup ERST Resources */

	apei_resources_fini(&erst_resources);



	return 0;



err_release_erange: