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

Commit 5042d997 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: fixup sparse endianness warnings in proc.c
  PCI PM: make more PCI PM core functionality available to drivers
  PCI/DMAR: don't assume presence of RMRRs
  PCI hotplug: fix error path in pci_slot's register_slot
parents 5c402355 f17a077e

drivers/acpi/pci_slot.c

+3 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
 *  Thanks to Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> for code

 *  review and fixes.

 *

 *  Copyright (C) 2007 Alex Chiang <achiang@hp.com>

 *  Copyright (C) 2007 Hewlett-Packard Development Company, L.P.

 *  Copyright (C) 2007-2008 Hewlett-Packard Development Company, L.P.

 *  	Alex Chiang <achiang@hp.com>

 *

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

 *  under the terms and conditions of the GNU General Public License,
@@ -158,6 +158,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) 
	if (IS_ERR(pci_slot)) {

		err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot));

		kfree(slot);

		return AE_OK;

	}



	slot->root_handle = parent_context->root_handle;

drivers/pci/dmar.c

+1 −3
Original line number Diff line number Diff line
@@ -317,10 +317,8 @@ int __init dmar_table_init(void) 
		return -ENODEV;

	}



	if (list_empty(&dmar_rmrr_units)) {

	if (list_empty(&dmar_rmrr_units))

		printk(KERN_INFO PREFIX "No RMRR found\n");

		return -ENODEV;

	}



	return 0;

}

drivers/pci/pci.c

+24 −10
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state) 
 * @dev: PCI device to handle.

 * @state: PCI state from which device will issue PME#.

 */

static bool pci_pme_capable(struct pci_dev *dev, pci_power_t state)

bool pci_pme_capable(struct pci_dev *dev, pci_power_t state)

{

	if (!dev->pm_cap)

		return false;
@@ -1123,17 +1123,10 @@ int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable) 
}



/**

 * pci_prepare_to_sleep - prepare PCI device for system-wide transition into a sleep state

 * @dev: Device to handle.

 *

 * Choose the power state appropriate for the device depending on whether

 * it can wake up the system and/or is power manageable by the platform

 * (PCI_D3hot is the default) and put the device into that state.

 */

int pci_prepare_to_sleep(struct pci_dev *dev)

pci_power_t pci_target_state(struct pci_dev *dev)

{

	pci_power_t target_state = PCI_D3hot;

	int error;



	if (platform_pci_power_manageable(dev)) {

		/*
@@ -1160,7 +1153,7 @@ int pci_prepare_to_sleep(struct pci_dev *dev) 
		 * to generate PME#.

		 */

		if (!dev->pm_cap)

			return -EIO;

			return PCI_POWER_ERROR;



		if (dev->pme_support) {

			while (target_state
@@ -1169,6 +1162,25 @@ int pci_prepare_to_sleep(struct pci_dev *dev) 
		}

	}



	return target_state;

}



/**

 * pci_prepare_to_sleep - prepare PCI device for system-wide transition into a sleep state

 * @dev: Device to handle.

 *

 * Choose the power state appropriate for the device depending on whether

 * it can wake up the system and/or is power manageable by the platform

 * (PCI_D3hot is the default) and put the device into that state.

 */

int pci_prepare_to_sleep(struct pci_dev *dev)

{

	pci_power_t target_state = pci_target_state(dev);

	int error;



	if (target_state == PCI_POWER_ERROR)

		return -EIO;



	pci_enable_wake(dev, target_state, true);



	error = pci_set_power_state(dev, target_state);
@@ -1918,7 +1930,9 @@ EXPORT_SYMBOL(pci_select_bars); 
EXPORT_SYMBOL(pci_set_power_state);

EXPORT_SYMBOL(pci_save_state);

EXPORT_SYMBOL(pci_restore_state);

EXPORT_SYMBOL(pci_pme_capable);

EXPORT_SYMBOL(pci_enable_wake);

EXPORT_SYMBOL(pci_target_state);

EXPORT_SYMBOL(pci_prepare_to_sleep);

EXPORT_SYMBOL(pci_back_from_sleep);

EXPORT_SYMBOL_GPL(pci_set_pcie_reset_state);

drivers/pci/proc.c

+9 −9
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp 
	if ((pos & 3) && cnt > 2) {

		unsigned short val;

		pci_user_read_config_word(dev, pos, &val);

		__put_user(cpu_to_le16(val), (unsigned short __user *) buf);

		__put_user(cpu_to_le16(val), (__le16 __user *) buf);

		buf += 2;

		pos += 2;

		cnt -= 2;
@@ -97,7 +97,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp 
	while (cnt >= 4) {

		unsigned int val;

		pci_user_read_config_dword(dev, pos, &val);

		__put_user(cpu_to_le32(val), (unsigned int __user *) buf);

		__put_user(cpu_to_le32(val), (__le32 __user *) buf);

		buf += 4;

		pos += 4;

		cnt -= 4;
@@ -106,7 +106,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp 
	if (cnt >= 2) {

		unsigned short val;

		pci_user_read_config_word(dev, pos, &val);

		__put_user(cpu_to_le16(val), (unsigned short __user *) buf);

		__put_user(cpu_to_le16(val), (__le16 __user *) buf);

		buf += 2;

		pos += 2;

		cnt -= 2;
@@ -156,8 +156,8 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof 
	}



	if ((pos & 3) && cnt > 2) {

		unsigned short val;

		__get_user(val, (unsigned short __user *) buf);

		__le16 val;

		__get_user(val, (__le16 __user *) buf);

		pci_user_write_config_word(dev, pos, le16_to_cpu(val));

		buf += 2;

		pos += 2;
@@ -165,8 +165,8 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof 
	}



	while (cnt >= 4) {

		unsigned int val;

		__get_user(val, (unsigned int __user *) buf);

		__le32 val;

		__get_user(val, (__le32 __user *) buf);

		pci_user_write_config_dword(dev, pos, le32_to_cpu(val));

		buf += 4;

		pos += 4;
@@ -174,8 +174,8 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof 
	}



	if (cnt >= 2) {

		unsigned short val;

		__get_user(val, (unsigned short __user *) buf);

		__le16 val;

		__get_user(val, (__le16 __user *) buf);

		pci_user_write_config_word(dev, pos, le16_to_cpu(val));

		buf += 2;

		pos += 2;

include/linux/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -638,7 +638,9 @@ int pci_save_state(struct pci_dev *dev); 
int pci_restore_state(struct pci_dev *dev);

int pci_set_power_state(struct pci_dev *dev, pci_power_t state);

pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state);

bool pci_pme_capable(struct pci_dev *dev, pci_power_t state);

int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable);

pci_power_t pci_target_state(struct pci_dev *dev);

int pci_prepare_to_sleep(struct pci_dev *dev);

int pci_back_from_sleep(struct pci_dev *dev);