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

Commit b7f21bb2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (21 commits)
  x86/PCI: make 32 bit NUMA node array int, not unsigned char
  x86/PCI: default pcibus cpumask to all cpus if it lacks affinity
  MAINTAINTERS: remove hotplug driver entries
  PCI: pciehp: remove slot capabilities definitions
  PCI: pciehp: remove error message definitions
  PCI: pciehp: remove number field
  PCI: pciehp: remove hpc_ops
  PCI: pciehp: remove pci_dev field
  PCI: pciehp: remove crit_sect mutex
  PCI: pciehp: remove slot_bus field
  PCI: pciehp: remove first_slot field
  PCI: pciehp: remove slot_device_offset field
  PCI: pciehp: remove hp_slot field
  PCI: pciehp: remove device field
  PCI: pciehp: remove bus field
  PCI: pciehp: remove slot_num_inc field
  PCI: pciehp: remove num_slots field
  PCI: pciehp: remove slot_list field
  PCI: fix VGA arbiter header file
  PCI: Disable AER with pci=nomsi
  ...

Fixed up trivial conflicts in MAINTAINERS
parents 7ca263cd 76baeebf

MAINTAINERS

+3 −16
Original line number Diff line number Diff line
@@ -257,12 +257,6 @@ W: http://www.lesswatts.org/projects/acpi/ 
S:	Supported

F:	drivers/acpi/fan.c



ACPI PCI HOTPLUG DRIVER

M:	Kristen Carlson Accardi <kristen.c.accardi@intel.com>

L:	linux-pci@vger.kernel.org

S:	Supported

F:	drivers/pci/hotplug/acpi*



ACPI THERMAL DRIVER

M:	Zhang Rui <rui.zhang@intel.com>

L:	linux-acpi@vger.kernel.org
@@ -4005,11 +3999,11 @@ F: Documentation/PCI/ 
F:	drivers/pci/

F:	include/linux/pci*



PCIE HOTPLUG DRIVER

M:	Kristen Carlson Accardi <kristen.c.accardi@intel.com>

PCI HOTPLUG

M:	Jesse Barnes <jbarnes@virtuousgeek.org>

L:	linux-pci@vger.kernel.org

S:	Supported

F:	drivers/pci/pcie/

F:	drivers/pci/hotplug



PCMCIA SUBSYSTEM

P:	Linux PCMCIA Team
@@ -4672,12 +4666,6 @@ F: drivers/serial/serial_lh7a40x.c 
F:	drivers/usb/gadget/lh7a40*

F:	drivers/usb/host/ohci-lh7a40*



SHPC HOTPLUG DRIVER

M:	Kristen Carlson Accardi <kristen.c.accardi@intel.com>

L:	linux-pci@vger.kernel.org

S:	Supported

F:	drivers/pci/hotplug/shpchp*



SIMPLE FIRMWARE INTERFACE (SFI)

P:	Len Brown

M:	lenb@kernel.org
@@ -4689,7 +4677,6 @@ F: arch/x86/kernel/*sfi* 
F:	drivers/sfi/

F:	include/linux/sfi*.h





SIMTEC EB110ATX (Chalice CATS)

P:	Ben Dooks

M:	Vincent Sanders <support@simtec.co.uk>

arch/x86/include/asm/pci.h

+5 −1
Original line number Diff line number Diff line
@@ -143,7 +143,11 @@ static inline int __pcibus_to_node(const struct pci_bus *bus) 
static inline const struct cpumask *

cpumask_of_pcibus(const struct pci_bus *bus)

{

	return cpumask_of_node(__pcibus_to_node(bus));

	int node;



	node = __pcibus_to_node(bus);

	return (node == -1) ? cpu_online_mask :

			      cpumask_of_node(node);

}

#endif

arch/x86/pci/common.c

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ int get_mp_bus_to_node(int busnum) 


#else /* CONFIG_X86_32 */



static unsigned char mp_bus_to_node[BUS_NR] = {

static int mp_bus_to_node[BUS_NR] = {

	[0 ... BUS_NR - 1] = -1

};

drivers/pci/hotplug/pciehp.h

+29 −78
Original line number Diff line number Diff line
@@ -72,15 +72,9 @@ do { \ 


#define SLOT_NAME_SIZE 10

struct slot {

	u8 bus;

	u8 device;

	u8 state;

	u8 hp_slot;

	u32 number;

	struct controller *ctrl;

	struct hpc_ops *hpc_ops;

	struct hotplug_slot *hotplug_slot;

	struct list_head	slot_list;

	struct delayed_work work;	/* work for button event */

	struct mutex lock;

};
@@ -92,18 +86,10 @@ struct event_info { 
};



struct controller {

	struct mutex crit_sect;		/* critical section mutex */

	struct mutex ctrl_lock;		/* controller lock */

	int num_slots;			/* Number of slots on ctlr */

	int slot_num_inc;		/* 1 or -1 */

	struct pci_dev *pci_dev;

	struct pcie_device *pcie;	/* PCI Express port service */

	struct list_head slot_list;

	struct hpc_ops *hpc_ops;

	struct slot *slot;

	wait_queue_head_t queue;	/* sleep & wake process */

	u8 slot_device_offset;

	u32 first_slot;		/* First physical slot number */  /* PCIE only has 1 slot */

	u8 slot_bus;		/* Bus where the slots handled by this controller sit */

	u32 slot_cap;

	u8 cap_base;

	struct timer_list poll_timer;
@@ -131,35 +117,15 @@ struct controller { 
#define POWERON_STATE			3

#define POWEROFF_STATE			4



/* Error messages */

#define INTERLOCK_OPEN			0x00000002

#define ADD_NOT_SUPPORTED		0x00000003

#define CARD_FUNCTIONING		0x00000005

#define ADAPTER_NOT_SAME		0x00000006

#define NO_ADAPTER_PRESENT		0x00000009

#define NOT_ENOUGH_RESOURCES		0x0000000B

#define DEVICE_TYPE_NOT_SUPPORTED	0x0000000C

#define WRONG_BUS_FREQUENCY		0x0000000D

#define POWER_FAILURE			0x0000000E



/* Field definitions in Slot Capabilities Register */

#define ATTN_BUTTN_PRSN	0x00000001

#define	PWR_CTRL_PRSN	0x00000002

#define MRL_SENS_PRSN	0x00000004

#define ATTN_LED_PRSN	0x00000008

#define PWR_LED_PRSN	0x00000010

#define HP_SUPR_RM_SUP	0x00000020

#define EMI_PRSN	0x00020000

#define NO_CMD_CMPL_SUP	0x00040000



#define ATTN_BUTTN(ctrl)	((ctrl)->slot_cap & ATTN_BUTTN_PRSN)

#define POWER_CTRL(ctrl)	((ctrl)->slot_cap & PWR_CTRL_PRSN)

#define MRL_SENS(ctrl)		((ctrl)->slot_cap & MRL_SENS_PRSN)

#define ATTN_LED(ctrl)		((ctrl)->slot_cap & ATTN_LED_PRSN)

#define PWR_LED(ctrl)		((ctrl)->slot_cap & PWR_LED_PRSN)

#define HP_SUPR_RM(ctrl)	((ctrl)->slot_cap & HP_SUPR_RM_SUP)

#define EMI(ctrl)		((ctrl)->slot_cap & EMI_PRSN)

#define NO_CMD_CMPL(ctrl)	((ctrl)->slot_cap & NO_CMD_CMPL_SUP)

#define ATTN_BUTTN(ctrl)	((ctrl)->slot_cap & PCI_EXP_SLTCAP_ABP)

#define POWER_CTRL(ctrl)	((ctrl)->slot_cap & PCI_EXP_SLTCAP_PCP)

#define MRL_SENS(ctrl)		((ctrl)->slot_cap & PCI_EXP_SLTCAP_MRLSP)

#define ATTN_LED(ctrl)		((ctrl)->slot_cap & PCI_EXP_SLTCAP_AIP)

#define PWR_LED(ctrl)		((ctrl)->slot_cap & PCI_EXP_SLTCAP_PIP)

#define HP_SUPR_RM(ctrl)	((ctrl)->slot_cap & PCI_EXP_SLTCAP_HPS)

#define EMI(ctrl)		((ctrl)->slot_cap & PCI_EXP_SLTCAP_EIP)

#define NO_CMD_CMPL(ctrl)	((ctrl)->slot_cap & PCI_EXP_SLTCAP_NCCS)

#define PSN(ctrl)		((ctrl)->slot_cap >> 19)



extern int pciehp_sysfs_enable_slot(struct slot *slot);

extern int pciehp_sysfs_disable_slot(struct slot *slot);
@@ -175,45 +141,30 @@ int pcie_init_notification(struct controller *ctrl); 
int pciehp_enable_slot(struct slot *p_slot);

int pciehp_disable_slot(struct slot *p_slot);

int pcie_enable_notification(struct controller *ctrl);

int pciehp_power_on_slot(struct slot *slot);

int pciehp_power_off_slot(struct slot *slot);

int pciehp_get_power_status(struct slot *slot, u8 *status);

int pciehp_get_attention_status(struct slot *slot, u8 *status);



int pciehp_set_attention_status(struct slot *slot, u8 status);

int pciehp_get_latch_status(struct slot *slot, u8 *status);

int pciehp_get_adapter_status(struct slot *slot, u8 *status);

int pciehp_get_max_link_speed(struct slot *slot, enum pci_bus_speed *speed);

int pciehp_get_max_link_width(struct slot *slot, enum pcie_link_width *val);

int pciehp_get_cur_link_speed(struct slot *slot, enum pci_bus_speed *speed);

int pciehp_get_cur_link_width(struct slot *slot, enum pcie_link_width *val);

int pciehp_query_power_fault(struct slot *slot);

void pciehp_green_led_on(struct slot *slot);

void pciehp_green_led_off(struct slot *slot);

void pciehp_green_led_blink(struct slot *slot);

int pciehp_check_link_status(struct controller *ctrl);

void pciehp_release_ctrl(struct controller *ctrl);



static inline const char *slot_name(struct slot *slot)

{

	return hotplug_slot_name(slot->hotplug_slot);

}



static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)

{

	struct slot *slot;



	list_for_each_entry(slot, &ctrl->slot_list, slot_list) {

		if (slot->device == device)

			return slot;

	}



	ctrl_err(ctrl, "Slot (device=0x%02x) not found\n", device);

	return NULL;

}



struct hpc_ops {

	int (*power_on_slot)(struct slot *slot);

	int (*power_off_slot)(struct slot *slot);

	int (*get_power_status)(struct slot *slot, u8 *status);

	int (*get_attention_status)(struct slot *slot, u8 *status);

	int (*set_attention_status)(struct slot *slot, u8 status);

	int (*get_latch_status)(struct slot *slot, u8 *status);

	int (*get_adapter_status)(struct slot *slot, u8 *status);

	int (*get_max_bus_speed)(struct slot *slot, enum pci_bus_speed *speed);

	int (*get_cur_bus_speed)(struct slot *slot, enum pci_bus_speed *speed);

	int (*get_max_lnk_width)(struct slot *slot, enum pcie_link_width *val);

	int (*get_cur_lnk_width)(struct slot *slot, enum pcie_link_width *val);

	int (*query_power_fault)(struct slot *slot);

	void (*green_led_on)(struct slot *slot);

	void (*green_led_off)(struct slot *slot);

	void (*green_led_blink)(struct slot *slot);

	void (*release_ctlr)(struct controller *ctrl);

	int (*check_lnk_status)(struct controller *ctrl);

};



#ifdef CONFIG_ACPI

#include <acpi/acpi.h>

#include <acpi/acpi_bus.h>

drivers/pci/hotplug/pciehp_acpi.c

+11 −6
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ 
#define PCIEHP_DETECT_AUTO	(2)

#define PCIEHP_DETECT_DEFAULT	PCIEHP_DETECT_AUTO



struct dummy_slot {

	u32 number;

	struct list_head list;

};



static int slot_detection_mode;

static char *pciehp_detect_mode;

module_param(pciehp_detect_mode, charp, 0444);
@@ -77,7 +82,7 @@ static int __init dummy_probe(struct pcie_device *dev) 
	int pos;

	u32 slot_cap;

	acpi_handle handle;

	struct slot *slot, *tmp;

	struct dummy_slot *slot, *tmp;

	struct pci_dev *pdev = dev->port;

	/* Note: pciehp_detect_mode != PCIEHP_DETECT_ACPI here */

	if (pciehp_get_hp_hw_control_from_firmware(pdev))
@@ -89,11 +94,11 @@ static int __init dummy_probe(struct pcie_device *dev) 
	if (!slot)

		return -ENOMEM;

	slot->number = slot_cap >> 19;

	list_for_each_entry(tmp, &dummy_slots, slot_list) {

	list_for_each_entry(tmp, &dummy_slots, list) {

		if (tmp->number == slot->number)

			dup_slot_id++;

	}

	list_add_tail(&slot->slot_list, &dummy_slots);

	list_add_tail(&slot->list, &dummy_slots);

	handle = DEVICE_ACPI_HANDLE(&pdev->dev);

	if (!acpi_slot_detected && acpi_pci_detect_ejectable(handle))

		acpi_slot_detected = 1;
@@ -109,11 +114,11 @@ static struct pcie_port_service_driver __initdata dummy_driver = { 


static int __init select_detection_mode(void)

{

	struct slot *slot, *tmp;

	struct dummy_slot *slot, *tmp;

	pcie_port_service_register(&dummy_driver);

	pcie_port_service_unregister(&dummy_driver);

	list_for_each_entry_safe(slot, tmp, &dummy_slots, slot_list) {

		list_del(&slot->slot_list);

	list_for_each_entry_safe(slot, tmp, &dummy_slots, list) {

		list_del(&slot->list);

		kfree(slot);

	}

	if (acpi_slot_detected && dup_slot_id)