Commit 27a24cfa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma 

Pull slave-dma fixes from Vinod Koul:
 "We have two patches from Andy & Rafael fixing the Lynxpoint dma"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  ACPI / LPSS: register clock device for Lynxpoint DMA properly
  dma: acpi-dma: parse CSRT to extract additional resources
parents 6b3f7b5c b59cc200

drivers/acpi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ acpi-y += processor_core.o 
acpi-y				+= ec.o

acpi-$(CONFIG_ACPI_DOCK)	+= dock.o

acpi-y				+= pci_root.o pci_link.o pci_irq.o

acpi-y				+= csrt.o

acpi-$(CONFIG_X86_INTEL_LPSS)	+= acpi_lpss.o

acpi-y				+= acpi_platform.o

acpi-y				+= power.o

drivers/acpi/acpi_lpss.c

+22 −4
Original line number Diff line number Diff line
@@ -35,11 +35,16 @@ ACPI_MODULE_NAME("acpi_lpss"); 


struct lpss_device_desc {

	bool clk_required;

	const char *clk_parent;

	const char *clkdev_name;

	bool ltr_required;

	unsigned int prv_offset;

};



static struct lpss_device_desc lpss_dma_desc = {

	.clk_required = true,

	.clkdev_name = "hclk",

};



struct lpss_private_data {

	void __iomem *mmio_base;

	resource_size_t mmio_size;
@@ -49,7 +54,6 @@ struct lpss_private_data { 


static struct lpss_device_desc lpt_dev_desc = {

	.clk_required = true,

	.clk_parent = "lpss_clk",

	.prv_offset = 0x800,

	.ltr_required = true,

};
@@ -60,6 +64,9 @@ static struct lpss_device_desc lpt_sdio_dev_desc = { 
};



static const struct acpi_device_id acpi_lpss_device_ids[] = {

	/* Generic LPSS devices */

	{ "INTL9C60", (unsigned long)&lpss_dma_desc },



	/* Lynxpoint LPSS devices */

	{ "INT33C0", (unsigned long)&lpt_dev_desc },

	{ "INT33C1", (unsigned long)&lpt_dev_desc },
@@ -91,16 +98,27 @@ static int register_device_clock(struct acpi_device *adev, 
				 struct lpss_private_data *pdata)

{

	const struct lpss_device_desc *dev_desc = pdata->dev_desc;

	struct lpss_clk_data *clk_data;



	if (!lpss_clk_dev)

		lpt_register_clock_device();



	if (!dev_desc->clk_parent || !pdata->mmio_base

	clk_data = platform_get_drvdata(lpss_clk_dev);

	if (!clk_data)

		return -ENODEV;



	if (dev_desc->clkdev_name) {

		clk_register_clkdev(clk_data->clk, dev_desc->clkdev_name,

				    dev_name(&adev->dev));

		return 0;

	}



	if (!pdata->mmio_base

	    || pdata->mmio_size < dev_desc->prv_offset + LPSS_CLK_SIZE)

		return -ENODATA;



	pdata->clk = clk_register_gate(NULL, dev_name(&adev->dev),

				       dev_desc->clk_parent, 0,

				       clk_data->name, 0,

				       pdata->mmio_base + dev_desc->prv_offset,

				       0, 0, NULL);

	if (IS_ERR(pdata->clk))

drivers/acpi/csrt.c

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

 * Support for Core System Resources Table (CSRT)

 *

 * Copyright (C) 2013, Intel Corporation

 * Authors: Mika Westerberg <mika.westerberg@linux.intel.com>

 *	    Andy Shevchenko <andriy.shevchenko@linux.intel.com>

 *

 * 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.

 */



#define pr_fmt(fmt) "ACPI: CSRT: " fmt



#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/sizes.h>



ACPI_MODULE_NAME("CSRT");



static int __init acpi_csrt_parse_shared_info(struct platform_device *pdev,

					      const struct acpi_csrt_group *grp)

{

	const struct acpi_csrt_shared_info *si;

	struct resource res[3];

	size_t nres;

	int ret;



	memset(res, 0, sizeof(res));

	nres = 0;



	si = (const struct acpi_csrt_shared_info *)&grp[1];

	/*

	 * The peripherals that are listed on CSRT typically support only

	 * 32-bit addresses so we only use the low part of MMIO base for

	 * now.

	 */

	if (!si->mmio_base_high && si->mmio_base_low) {

		/*

		 * There is no size of the memory resource in shared_info

		 * so we assume that it is 4k here.

		 */

		res[nres].start = si->mmio_base_low;

		res[nres].end = res[0].start + SZ_4K - 1;

		res[nres++].flags = IORESOURCE_MEM;

	}



	if (si->gsi_interrupt) {

		int irq = acpi_register_gsi(NULL, si->gsi_interrupt,

					    si->interrupt_mode,

					    si->interrupt_polarity);

		res[nres].start = irq;

		res[nres].end = irq;

		res[nres++].flags = IORESOURCE_IRQ;

	}



	if (si->base_request_line || si->num_handshake_signals) {

		/*

		 * We pass the driver a DMA resource describing the range

		 * of request lines the device supports.

		 */

		res[nres].start = si->base_request_line;

		res[nres].end = res[nres].start + si->num_handshake_signals - 1;

		res[nres++].flags = IORESOURCE_DMA;

	}



	ret = platform_device_add_resources(pdev, res, nres);

	if (ret) {

		if (si->gsi_interrupt)

			acpi_unregister_gsi(si->gsi_interrupt);

		return ret;

	}



	return 0;

}



static int __init

acpi_csrt_parse_resource_group(const struct acpi_csrt_group *grp)

{

	struct platform_device *pdev;

	char vendor[5], name[16];

	int ret, i;



	vendor[0] = grp->vendor_id;

	vendor[1] = grp->vendor_id >> 8;

	vendor[2] = grp->vendor_id >> 16;

	vendor[3] = grp->vendor_id >> 24;

	vendor[4] = '\0';



	if (grp->shared_info_length != sizeof(struct acpi_csrt_shared_info))

		return -ENODEV;



	snprintf(name, sizeof(name), "%s%04X", vendor, grp->device_id);

	pdev = platform_device_alloc(name, PLATFORM_DEVID_AUTO);

	if (!pdev)

		return -ENOMEM;



	/* Add resources based on the shared info */

	ret = acpi_csrt_parse_shared_info(pdev, grp);

	if (ret)

		goto fail;



	ret = platform_device_add(pdev);

	if (ret)

		goto fail;



	for (i = 0; i < pdev->num_resources; i++)

		dev_dbg(&pdev->dev, "%pR\n", &pdev->resource[i]);



	return 0;



fail:

	platform_device_put(pdev);

	return ret;

}



/*

 * CSRT or Core System Resources Table is a proprietary ACPI table

 * introduced by Microsoft. This table can contain devices that are not in

 * the system DSDT table. In particular DMA controllers might be described

 * here.

 *

 * We present these devices as normal platform devices that don't have ACPI

 * IDs or handle. The platform device name will be something like

 * <VENDOR><DEVID>.<n>.auto for example: INTL9C06.0.auto.

 */

void __init acpi_csrt_init(void)

{

	struct acpi_csrt_group *grp, *end;

	struct acpi_table_csrt *csrt;

	acpi_status status;

	int ret;



	status = acpi_get_table(ACPI_SIG_CSRT, 0,

				(struct acpi_table_header **)&csrt);

	if (ACPI_FAILURE(status)) {

		if (status != AE_NOT_FOUND)

			pr_warn("failed to get the CSRT table\n");

		return;

	}



	pr_debug("parsing CSRT table for devices\n");



	grp = (struct acpi_csrt_group *)(csrt + 1);

	end = (struct acpi_csrt_group *)((void *)csrt + csrt->header.length);



	while (grp < end) {

		ret = acpi_csrt_parse_resource_group(grp);

		if (ret) {

			pr_warn("error in parsing resource group: %d\n", ret);

			return;

		}



		grp = (struct acpi_csrt_group *)((void *)grp + grp->length);

	}

}

drivers/acpi/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ void acpi_pci_link_init(void); 
void acpi_pci_root_hp_init(void);

void acpi_platform_init(void);

int acpi_sysfs_init(void);

void acpi_csrt_init(void);

#ifdef CONFIG_ACPI_CONTAINER

void acpi_container_init(void);

#else

drivers/acpi/scan.c

+0 −1
Original line number Diff line number Diff line
@@ -2043,7 +2043,6 @@ int __init acpi_scan_init(void) 
	acpi_pci_link_init();

	acpi_platform_init();

	acpi_lpss_init();

	acpi_csrt_init();

	acpi_container_init();

	acpi_memory_hotplug_init();

CRA Git | Maintained and supported by SUSTech CRA and CCSE