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

Commit 3a72af09 authored by Yijing Wang's avatar Yijing Wang Committed by Tony Luck
Browse files

PCI/IA64: introduce probe_pci_root_info() to manage _CRS resource 



Currently, initialize _CRS resource code in IA64 make pci_acpi_scan_root()
some lengthiness. Introduce probe_pci_root_info() to manage it like in X86,

Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 2932239f

arch/ia64/pci/pci.c

+57 −43
Original line number Original line Diff line number Diff line
@@ -376,6 +376,50 @@ static void release_pci_root_info(struct pci_host_bridge *bridge) 
	__release_pci_root_info(info);

	__release_pci_root_info(info);

}

}





static int

probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device,

		int busnum, int domain)

{

	char *name;



	name = kmalloc(16, GFP_KERNEL);

	if (!name)

		return -ENOMEM;



	sprintf(name, "PCI Bus %04x:%02x", domain, busnum);

	info->bridge = device;

	info->name = name;



	acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,

			&info->res_num);

	if (info->res_num) {

		info->res =

			kzalloc_node(sizeof(*info->res) * info->res_num,

				     GFP_KERNEL, info->controller->node);

		if (!info->res) {

			kfree(name);

			return -ENOMEM;

		}



		info->res_offset =

			kzalloc_node(sizeof(*info->res_offset) * info->res_num,

					GFP_KERNEL, info->controller->node);

		if (!info->res_offset) {

			kfree(name);

			kfree(info->res);

			info->res = NULL;

			return -ENOMEM;

		}



		info->res_num = 0;

		acpi_walk_resources(device->handle, METHOD_NAME__CRS,

			add_window, info);

	} else

		kfree(name);



	return 0;

}



struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)

struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)

{

{

	struct acpi_device *device = root->device;

	struct acpi_device *device = root->device;
@@ -385,12 +429,11 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
	struct pci_root_info *info = NULL;

	struct pci_root_info *info = NULL;

	int busnum = root->secondary.start;

	int busnum = root->secondary.start;

	struct pci_bus *pbus;

	struct pci_bus *pbus;

	char *name;

	int pxm, ret;

	int pxm;





	controller = alloc_pci_controller(domain);

	controller = alloc_pci_controller(domain);

	if (!controller)

	if (!controller)

		goto out1;

		return NULL;





	controller->acpi_handle = device->handle;

	controller->acpi_handle = device->handle;
@@ -404,41 +447,23 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
	if (!info) {

	if (!info) {

		printk(KERN_WARNING

		printk(KERN_WARNING

				"pci_bus %04x:%02x: ignored (out of memory)\n",

				"pci_bus %04x:%02x: ignored (out of memory)\n",

				root->segment, busnum);

				domain, busnum);

		goto out2;

		kfree(controller);

		return NULL;

	}

	}





	info->controller = controller;

	INIT_LIST_HEAD(&info->io_resources);

	INIT_LIST_HEAD(&info->io_resources);

	INIT_LIST_HEAD(&info->resources);

	INIT_LIST_HEAD(&info->resources);

	/* insert busn resource at first */

	pci_add_resource(&info->resources, &root->secondary);

	acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,

			&info->res_num);

	if (info->res_num) {

		info->res =

			kzalloc_node(sizeof(*info->res) * info->res_num,

				     GFP_KERNEL, controller->node);

		if (!info->res)

			goto out3;



		info->res_offset =

			kzalloc_node(sizeof(*info->res_offset) * info->res_num,

				GFP_KERNEL, controller->node);

		if (!info->res_offset)

			goto out4;





		name = kmalloc(16, GFP_KERNEL);

	ret = probe_pci_root_info(info, device, busnum, domain);

		if (!name)

	if (ret) {

			goto out5;

		kfree(info->controller);



		kfree(info);

		sprintf(name, "PCI Bus %04x:%02x", domain, bus);

		return NULL;

		info->bridge = device;

		info->controller = controller;

		info->name = name;

		info->res_num = 0;

		acpi_walk_resources(device->handle, METHOD_NAME__CRS,

			add_window, info);

	}

	}

	/* insert busn resource at first */

	pci_add_resource(&info->resources, &root->secondary);

	/*

	/*

	 * See arch/x86/pci/acpi.c.

	 * See arch/x86/pci/acpi.c.

	 * The desired pci bus might already be scanned in a quirk. We

	 * The desired pci bus might already be scanned in a quirk. We
@@ -457,17 +482,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
			release_pci_root_info, info);

			release_pci_root_info, info);

	pci_scan_child_bus(pbus);

	pci_scan_child_bus(pbus);

	return pbus;

	return pbus;



out5:

	kfree(info->res_offset);

out4:

	kfree(info->res);

out3:

	kfree(info);

out2:

	kfree(controller);

out1:

	return NULL;

}

}





int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)

int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)