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

Merge branches 'acpi-scan', 'acpi-bus' and 'acpi-platform' 

Merge changes related to ACPI device enumeration and ACPI support for
platform devices for 6.1-rc1:

 - Clean up ACPI platform devices support code (Andy Shevchenko, John
   Garry).

 - Clean up ACPI bus management code (Andy Shevchenko, ye xingchen).

 - Add support for multiple DMA windows with different offsets to the
   ACPI device enumeration code and use it on LoongArch (Jianmin Lv).

* acpi-scan:
  LoongArch: Use acpi_arch_dma_setup() and remove ARCH_HAS_PHYS_TO_DMA
  ACPI: scan: Support multiple DMA windows with different offsets

* acpi-bus:
  ACPI: bus: Refactor ACPI matching functions for better readability
  ACPI: bus: Drop kernel doc annotation from acpi_bus_notify()
  ACPI: bus: Remove the unneeded result variable

* acpi-platform:
  ACPI: platform: Use PLATFORM_DEVID_NONE in acpi_create_platform_device()
  ACPI: platform: Sort forbidden_id_list[] in ascending order
  ACPI: platform: Use sizeof(*pointer) instead of sizeof(type)
  ACPI: platform: Remove redundant print on -ENOMEM
  ACPI: platform: Get rid of redundant 'else'
parents d61991db c78c43fe fe79e392 2814108c

arch/loongarch/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ config LOONGARCH 
	select ARCH_ENABLE_MEMORY_HOTPLUG

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_INLINE_READ_LOCK if !PREEMPTION

arch/loongarch/kernel/dma.c

+21 −31
Original line number Diff line number Diff line
@@ -2,39 +2,29 @@ 
/*

 * Copyright (C) 2020-2022 Loongson Technology Corporation Limited

 */

#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/dma-direct.h>

#include <linux/dma-mapping.h>

#include <linux/dma-map-ops.h>

#include <linux/swiotlb.h>



#include <asm/bootinfo.h>

#include <asm/dma.h>

#include <asm/loongson.h>



/*

 * We extract 4bit node id (bit 44~47) from Loongson-3's

 * 48bit physical address space and embed it into 40bit.

 */



static int node_id_offset;



dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)

void acpi_arch_dma_setup(struct device *dev)

{

	long nid = (paddr >> 44) & 0xf;

	int ret;

	u64 mask, end = 0;

	const struct bus_dma_region *map = NULL;



	return ((nid << 44) ^ paddr) | (nid << node_id_offset);

}

	ret = acpi_dma_get_range(dev, &map);

	if (!ret && map) {

		const struct bus_dma_region *r = map;



phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)

{

	long nid = (daddr >> node_id_offset) & 0xf;

		for (end = 0; r->size; r++) {

			if (r->dma_start + r->size - 1 > end)

				end = r->dma_start + r->size - 1;

		}



	return ((nid << node_id_offset) ^ daddr) | (nid << 44);

		mask = DMA_BIT_MASK(ilog2(end) + 1);

		dev->bus_dma_limit = end;

		dev->dma_range_map = map;

		dev->coherent_dma_mask = min(dev->coherent_dma_mask, mask);

		*dev->dma_mask = min(*dev->dma_mask, mask);

	}



void __init plat_swiotlb_setup(void)

{

	swiotlb_init(true, SWIOTLB_VERBOSE);

	node_id_offset = ((readl(LS7A_DMA_CFG) & LS7A_DMA_NODE_MASK) >> LS7A_DMA_NODE_SHF) + 36;

}

arch/loongarch/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static void __init arch_mem_init(char **cmdline_p) 
	sparse_init();

	memblock_set_bottom_up(true);



	plat_swiotlb_setup();

	swiotlb_init(true, SWIOTLB_VERBOSE);



	dma_contiguous_reserve(PFN_PHYS(max_low_pfn));

drivers/acpi/acpi_platform.c

+7 −9
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 
#include "internal.h"



static const struct acpi_device_id forbidden_id_list[] = {

	{"ACPI0009", 0},	/* IOxAPIC */

	{"ACPI000A", 0},	/* IOAPIC */

	{"PNP0000",  0},	/* PIC */

	{"PNP0100",  0},	/* Timer */

	{"PNP0200",  0},	/* AT DMA Controller */

	{"ACPI0009", 0},	/* IOxAPIC */

	{"ACPI000A", 0},	/* IOAPIC */

	{"SMB0001",  0},	/* ACPI SMBUS virtual device */

	{"", 0},

	{ }

};



static struct platform_device *acpi_platform_device_find_by_companion(struct acpi_device *adev)
@@ -114,13 +114,11 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev, 


	INIT_LIST_HEAD(&resource_list);

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

	if (count < 0) {

	if (count < 0)

		return NULL;

	} else if (count > 0) {

		resources = kcalloc(count, sizeof(struct resource),

				    GFP_KERNEL);

	if (count > 0) {

		resources = kcalloc(count, sizeof(*resources), GFP_KERNEL);

		if (!resources) {

			dev_err(&adev->dev, "No memory for resources\n");

			acpi_dev_free_resource_list(&resource_list);

			return ERR_PTR(-ENOMEM);

		}
@@ -140,7 +138,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev, 
	 */

	pdevinfo.parent = parent ? acpi_get_first_physical_node(parent) : NULL;

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

	pdevinfo.id = -1;

	pdevinfo.id = PLATFORM_DEVID_NONE;

	pdevinfo.res = resources;

	pdevinfo.num_res = count;

	pdevinfo.fwnode = acpi_fwnode_handle(adev);

drivers/acpi/arm64/dma.c

+17 −11
Original line number Diff line number Diff line
@@ -4,11 +4,12 @@ 
#include <linux/device.h>

#include <linux/dma-direct.h>



void acpi_arch_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size)

void acpi_arch_dma_setup(struct device *dev)

{

	int ret;

	u64 end, mask;

	u64 dmaaddr = 0, size = 0, offset = 0;

	u64 size = 0;

	const struct bus_dma_region *map = NULL;



	/*

	 * If @dev is expected to be DMA-capable then the bus code that created
@@ -26,7 +27,19 @@ void acpi_arch_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size) 
	else

		size = 1ULL << 32;



	ret = acpi_dma_get_range(dev, &dmaaddr, &offset, &size);

	ret = acpi_dma_get_range(dev, &map);

	if (!ret && map) {

		const struct bus_dma_region *r = map;



		for (end = 0; r->size; r++) {

			if (r->dma_start + r->size - 1 > end)

				end = r->dma_start + r->size - 1;

		}



		size = end + 1;

		dev->dma_range_map = map;

	}



	if (ret == -ENODEV)

		ret = iort_dma_get_ranges(dev, &size);

	if (!ret) {
@@ -34,17 +47,10 @@ void acpi_arch_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size) 
		 * Limit coherent and dma mask based on size retrieved from

		 * firmware.

		 */

		end = dmaaddr + size - 1;

		end = size - 1;

		mask = DMA_BIT_MASK(ilog2(end) + 1);

		dev->bus_dma_limit = end;

		dev->coherent_dma_mask = min(dev->coherent_dma_mask, mask);

		*dev->dma_mask = min(*dev->dma_mask, mask);

	}



	*dma_addr = dmaaddr;

	*dma_size = size;



	ret = dma_direct_set_offset(dev, dmaaddr + offset, dmaaddr, size);



	dev_dbg(dev, "dma_offset(%#08llx)%s\n", offset, ret ? " failed!" : "");

}