Commit a217656c 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: (21 commits)
  pciehp: fix error message about getting hotplug control
  pci/irq: let pci_device_shutdown to call pci_msi_shutdown v2
  pci/irq: restore mask_bits in msi shutdown -v3
  doc: replace yet another dev with pdev for consistency in DMA-mapping.txt
  PCI: don't expose struct pci_vpd to userspace
  doc: fix an incorrect suggestion to pass NULL for PCI like buses
  Consistently use pdev as the variable of type struct pci_dev *.
  pciehp: Fix command write
  shpchp: fix slot name
  make pciehp_acpi_get_hp_hw_control_from_firmware()
  pciehp: Clean up pcie_init()
  pciehp: Mask hotplug interrupt at controller release
  pciehp: Remove useless hotplug interrupt enabling
  pciehp: Fix wrong slot capability check
  pciehp: Fix wrong slot control register access
  pciehp: Add missing memory barrier
  pciehp: Fix interrupt event handlig
  pciehp: fix slot name
  Update MAINTAINERS with location of PCI tree
  PCI: Add Intel SCH PCI IDs
  ...
parents 8f45c1a5 a53edac1

Documentation/DMA-mapping.txt

+19 −19
Original line number Diff line number Diff line
@@ -315,11 +315,11 @@ you should do: 


	dma_addr_t dma_handle;



	cpu_addr = pci_alloc_consistent(dev, size, &dma_handle);

	cpu_addr = pci_alloc_consistent(pdev, size, &dma_handle);



where dev is a struct pci_dev *. You should pass NULL for PCI like buses

where devices don't have struct pci_dev (like ISA, EISA).  This may be

called in interrupt context. 

where pdev is a struct pci_dev *. This may be called in interrupt context.

You should use dma_alloc_coherent (see DMA-API.txt) for buses

where devices don't have struct pci_dev (like ISA, EISA).



This argument is needed because the DMA translations may be bus

specific (and often is private to the bus which the device is attached
@@ -332,7 +332,7 @@ __get_free_pages (but takes size instead of a page order). If your 
driver needs regions sized smaller than a page, you may prefer using

the pci_pool interface, described below.



The consistent DMA mapping interfaces, for non-NULL dev, will by

The consistent DMA mapping interfaces, for non-NULL pdev, will by

default return a DMA address which is SAC (Single Address Cycle)

addressable.  Even if the device indicates (via PCI dma mask) that it

may address the upper 32-bits and thus perform DAC cycles, consistent
@@ -354,9 +354,9 @@ buffer you receive will not cross a 64K boundary. 


To unmap and free such a DMA region, you call:



	pci_free_consistent(dev, size, cpu_addr, dma_handle);

	pci_free_consistent(pdev, size, cpu_addr, dma_handle);



where dev, size are the same as in the above call and cpu_addr and

where pdev, size are the same as in the above call and cpu_addr and

dma_handle are the values pci_alloc_consistent returned to you.

This function may not be called in interrupt context.
@@ -371,9 +371,9 @@ Create a pci_pool like this: 


	struct pci_pool *pool;



	pool = pci_pool_create(name, dev, size, align, alloc);

	pool = pci_pool_create(name, pdev, size, align, alloc);



The "name" is for diagnostics (like a kmem_cache name); dev and size

The "name" is for diagnostics (like a kmem_cache name); pdev and size

are as above.  The device's hardware alignment requirement for this

type of data is "align" (which is expressed in bytes, and must be a

power of two).  If your device has no boundary crossing restrictions,
@@ -472,11 +472,11 @@ To map a single region, you do: 
	void *addr = buffer->ptr;

	size_t size = buffer->len;



	dma_handle = pci_map_single(dev, addr, size, direction);

	dma_handle = pci_map_single(pdev, addr, size, direction);



and to unmap it:



	pci_unmap_single(dev, dma_handle, size, direction);

	pci_unmap_single(pdev, dma_handle, size, direction);



You should call pci_unmap_single when the DMA activity is finished, e.g.

from the interrupt which told you that the DMA transfer is done.
@@ -493,17 +493,17 @@ Specifically: 
	unsigned long offset = buffer->offset;

	size_t size = buffer->len;



	dma_handle = pci_map_page(dev, page, offset, size, direction);

	dma_handle = pci_map_page(pdev, page, offset, size, direction);



	...



	pci_unmap_page(dev, dma_handle, size, direction);

	pci_unmap_page(pdev, dma_handle, size, direction);



Here, "offset" means byte offset within the given page.



With scatterlists, you map a region gathered from several regions by:



	int i, count = pci_map_sg(dev, sglist, nents, direction);

	int i, count = pci_map_sg(pdev, sglist, nents, direction);

	struct scatterlist *sg;



	for_each_sg(sglist, sg, count, i) {
@@ -527,7 +527,7 @@ accessed sg->address and sg->length as shown above. 


To unmap a scatterlist, just call:



	pci_unmap_sg(dev, sglist, nents, direction);

	pci_unmap_sg(pdev, sglist, nents, direction);



Again, make sure DMA activity has already finished.
@@ -550,11 +550,11 @@ correct copy of the DMA buffer. 
So, firstly, just map it with pci_map_{single,sg}, and after each DMA

transfer call either:



	pci_dma_sync_single_for_cpu(dev, dma_handle, size, direction);

	pci_dma_sync_single_for_cpu(pdev, dma_handle, size, direction);



or:



	pci_dma_sync_sg_for_cpu(dev, sglist, nents, direction);

	pci_dma_sync_sg_for_cpu(pdev, sglist, nents, direction);



as appropriate.
@@ -562,7 +562,7 @@ Then, if you wish to let the device get at the DMA area again, 
finish accessing the data with the cpu, and then before actually

giving the buffer to the hardware call either:



	pci_dma_sync_single_for_device(dev, dma_handle, size, direction);

	pci_dma_sync_single_for_device(pdev, dma_handle, size, direction);



or:
@@ -739,7 +739,7 @@ failure can be determined by: 


	dma_addr_t dma_handle;



	dma_handle = pci_map_single(dev, addr, size, direction);

	dma_handle = pci_map_single(pdev, addr, size, direction);

	if (pci_dma_mapping_error(dma_handle)) {

		/*

		 * reduce current DMA mapping usage,

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3114,6 +3114,7 @@ P: Jesse Barnes 
M:	jbarnes@virtuousgeek.org

L:	linux-kernel@vger.kernel.org

L:	linux-pci@atrey.karlin.mff.cuni.cz

T:	git kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git

S:	Supported



PCI HOTPLUG CORE

drivers/pci/hotplug/pciehp.h

+8 −9
Original line number Diff line number Diff line
@@ -93,11 +93,10 @@ struct controller { 
	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 */

	u8 ctrlcap;

	u32 slot_cap;

	u8 cap_base;

	struct timer_list poll_timer;

	volatile int cmd_busy;

	spinlock_t lock;

};



#define INT_BUTTON_IGNORE		0
@@ -137,13 +136,13 @@ struct controller { 
#define HP_SUPR_RM_SUP	0x00000020

#define EMI_PRSN	0x00020000



#define ATTN_BUTTN(cap)		(cap & ATTN_BUTTN_PRSN)

#define POWER_CTRL(cap)		(cap & PWR_CTRL_PRSN)

#define MRL_SENS(cap)		(cap & MRL_SENS_PRSN)

#define ATTN_LED(cap)		(cap & ATTN_LED_PRSN)

#define PWR_LED(cap)		(cap & PWR_LED_PRSN) 

#define HP_SUPR_RM(cap)		(cap & HP_SUPR_RM_SUP)

#define EMI(cap)		(cap & EMI_PRSN)

#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)



extern int pciehp_sysfs_enable_slot(struct slot *slot);

extern int pciehp_sysfs_disable_slot(struct slot *slot);

drivers/pci/hotplug/pciehp_core.c

+13 −6
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ int pciehp_debug; 
int pciehp_poll_mode;

int pciehp_poll_time;

int pciehp_force;

int pciehp_slot_with_bus;

struct workqueue_struct *pciehp_wq;



#define DRIVER_VERSION	"0.4"
@@ -55,10 +56,12 @@ module_param(pciehp_debug, bool, 0644); 
module_param(pciehp_poll_mode, bool, 0644);

module_param(pciehp_poll_time, int, 0644);

module_param(pciehp_force, bool, 0644);

module_param(pciehp_slot_with_bus, bool, 0644);

MODULE_PARM_DESC(pciehp_debug, "Debugging mode enabled or not");

MODULE_PARM_DESC(pciehp_poll_mode, "Using polling mechanism for hot-plug events or not");

MODULE_PARM_DESC(pciehp_poll_time, "Polling mechanism frequency, in seconds");

MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if _OSC and OSHP are missing");

MODULE_PARM_DESC(pciehp_slot_with_bus, "Use bus number in the slot name");



#define PCIE_MODULE_NAME "pciehp"
@@ -193,8 +196,12 @@ static void release_slot(struct hotplug_slot *hotplug_slot) 


static void make_slot_name(struct slot *slot)

{

	if (pciehp_slot_with_bus)

		snprintf(slot->hotplug_slot->name, SLOT_NAME_SIZE, "%04d_%04d",

			 slot->bus, slot->number);

	else

		snprintf(slot->hotplug_slot->name, SLOT_NAME_SIZE, "%d",

			 slot->number);

}



static int init_slots(struct controller *ctrl)
@@ -251,7 +258,7 @@ static int init_slots(struct controller *ctrl) 
			goto error_info;

		}

		/* create additional sysfs entries */

		if (EMI(ctrl->ctrlcap)) {

		if (EMI(ctrl)) {

			retval = sysfs_create_file(&hotplug_slot->kobj,

				&hotplug_slot_attr_lock.attr);

			if (retval) {
@@ -284,7 +291,7 @@ static void cleanup_slots(struct controller *ctrl) 
	list_for_each_safe(tmp, next, &ctrl->slot_list) {

		slot = list_entry(tmp, struct slot, slot_list);

		list_del(&slot->slot_list);

		if (EMI(ctrl->ctrlcap))

		if (EMI(ctrl))

			sysfs_remove_file(&slot->hotplug_slot->kobj,

				&hotplug_slot_attr_lock.attr);

		cancel_delayed_work(&slot->work);
@@ -305,7 +312,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status) 


	hotplug_slot->info->attention_status = status;



	if (ATTN_LED(slot->ctrl->ctrlcap))

	if (ATTN_LED(slot->ctrl))

		slot->hpc_ops->set_attention_status(slot, status);



	return 0;
@@ -472,7 +479,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ 
		if (rc)	/* -ENODEV: shouldn't happen, but deal with it */

			value = 0;

	}

	if ((POWER_CTRL(ctrl->ctrlcap)) && !value) {

	if ((POWER_CTRL(ctrl)) && !value) {

		rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/

		if (rc)

			goto err_out_free_ctrl_slot;

drivers/pci/hotplug/pciehp_ctrl.c

+23 −23
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ u8 pciehp_handle_power_fault(u8 hp_slot, struct controller *ctrl) 
static void set_slot_off(struct controller *ctrl, struct slot * pslot)

{

	/* turn off slot, turn on Amber LED, turn off Green LED if supported*/

	if (POWER_CTRL(ctrl->ctrlcap)) {

	if (POWER_CTRL(ctrl)) {

		if (pslot->hpc_ops->power_off_slot(pslot)) {

			err("%s: Issue of Slot Power Off command failed\n",

			    __func__);
@@ -186,10 +186,10 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot) 
		}

	}



	if (PWR_LED(ctrl->ctrlcap))

	if (PWR_LED(ctrl))

		pslot->hpc_ops->green_led_off(pslot);



	if (ATTN_LED(ctrl->ctrlcap)) {

	if (ATTN_LED(ctrl)) {

		if (pslot->hpc_ops->set_attention_status(pslot, 1)) {

			err("%s: Issue of Set Attention Led command failed\n",

			    __func__);
@@ -214,14 +214,14 @@ static int board_added(struct slot *p_slot) 
			__func__, p_slot->device,

			ctrl->slot_device_offset, p_slot->hp_slot);



	if (POWER_CTRL(ctrl->ctrlcap)) {

	if (POWER_CTRL(ctrl)) {

		/* Power on slot */

		retval = p_slot->hpc_ops->power_on_slot(p_slot);

		if (retval)

			return retval;

	}



	if (PWR_LED(ctrl->ctrlcap))

	if (PWR_LED(ctrl))

		p_slot->hpc_ops->green_led_blink(p_slot);



	/* Wait for ~1 second */
@@ -254,7 +254,7 @@ static int board_added(struct slot *p_slot) 
	 */

	if (pcie_mch_quirk)

		pci_fixup_device(pci_fixup_final, ctrl->pci_dev);

	if (PWR_LED(ctrl->ctrlcap))

	if (PWR_LED(ctrl))

  		p_slot->hpc_ops->green_led_on(p_slot);



	return 0;
@@ -279,7 +279,7 @@ static int remove_board(struct slot *p_slot) 


	dbg("In %s, hp_slot = %d\n", __func__, p_slot->hp_slot);



	if (POWER_CTRL(ctrl->ctrlcap)) {

	if (POWER_CTRL(ctrl)) {

		/* power off slot */

		retval = p_slot->hpc_ops->power_off_slot(p_slot);

		if (retval) {
@@ -289,7 +289,7 @@ static int remove_board(struct slot *p_slot) 
		}

	}



	if (PWR_LED(ctrl->ctrlcap))

	if (PWR_LED(ctrl))

		/* turn off Green LED */

		p_slot->hpc_ops->green_led_off(p_slot);
@@ -327,7 +327,7 @@ static void pciehp_power_thread(struct work_struct *work) 
	case POWERON_STATE:

		mutex_unlock(&p_slot->lock);

		if (pciehp_enable_slot(p_slot) &&

		    PWR_LED(p_slot->ctrl->ctrlcap))

		    PWR_LED(p_slot->ctrl))

			p_slot->hpc_ops->green_led_off(p_slot);

		mutex_lock(&p_slot->lock);

		p_slot->state = STATIC_STATE;
@@ -409,9 +409,9 @@ static void handle_button_press_event(struct slot *p_slot) 
			     "press.\n", p_slot->name);

		}

		/* blink green LED and turn off amber */

		if (PWR_LED(ctrl->ctrlcap))

		if (PWR_LED(ctrl))

			p_slot->hpc_ops->green_led_blink(p_slot);

		if (ATTN_LED(ctrl->ctrlcap))

		if (ATTN_LED(ctrl))

			p_slot->hpc_ops->set_attention_status(p_slot, 0);



		schedule_delayed_work(&p_slot->work, 5*HZ);
@@ -427,13 +427,13 @@ static void handle_button_press_event(struct slot *p_slot) 
		dbg("%s: button cancel\n", __func__);

		cancel_delayed_work(&p_slot->work);

		if (p_slot->state == BLINKINGOFF_STATE) {

			if (PWR_LED(ctrl->ctrlcap))

			if (PWR_LED(ctrl))

				p_slot->hpc_ops->green_led_on(p_slot);

		} else {

			if (PWR_LED(ctrl->ctrlcap))

			if (PWR_LED(ctrl))

				p_slot->hpc_ops->green_led_off(p_slot);

		}

		if (ATTN_LED(ctrl->ctrlcap))

		if (ATTN_LED(ctrl))

			p_slot->hpc_ops->set_attention_status(p_slot, 0);

		info("PCI slot #%s - action canceled due to button press\n",

		     p_slot->name);
@@ -492,16 +492,16 @@ static void interrupt_event_handler(struct work_struct *work) 
		handle_button_press_event(p_slot);

		break;

	case INT_POWER_FAULT:

		if (!POWER_CTRL(ctrl->ctrlcap))

		if (!POWER_CTRL(ctrl))

			break;

		if (ATTN_LED(ctrl->ctrlcap))

		if (ATTN_LED(ctrl))

			p_slot->hpc_ops->set_attention_status(p_slot, 1);

		if (PWR_LED(ctrl->ctrlcap))

		if (PWR_LED(ctrl))

			p_slot->hpc_ops->green_led_off(p_slot);

		break;

	case INT_PRESENCE_ON:

	case INT_PRESENCE_OFF:

		if (!HP_SUPR_RM(ctrl->ctrlcap))

		if (!HP_SUPR_RM(ctrl))

			break;

		dbg("Surprise Removal\n");

		update_slot_info(p_slot);
@@ -531,7 +531,7 @@ int pciehp_enable_slot(struct slot *p_slot) 
		mutex_unlock(&p_slot->ctrl->crit_sect);

		return -ENODEV;

	}

	if (MRL_SENS(p_slot->ctrl->ctrlcap)) {

	if (MRL_SENS(p_slot->ctrl)) {

		rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);

		if (rc || getstatus) {

			info("%s: latch open on slot(%s)\n", __func__,
@@ -541,7 +541,7 @@ int pciehp_enable_slot(struct slot *p_slot) 
		}

	}



	if (POWER_CTRL(p_slot->ctrl->ctrlcap)) {

	if (POWER_CTRL(p_slot->ctrl)) {

		rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);

		if (rc || getstatus) {

			info("%s: already enabled on slot(%s)\n", __func__,
@@ -576,7 +576,7 @@ int pciehp_disable_slot(struct slot *p_slot) 
	/* Check to see if (latch closed, card present, power on) */

	mutex_lock(&p_slot->ctrl->crit_sect);



	if (!HP_SUPR_RM(p_slot->ctrl->ctrlcap)) {

	if (!HP_SUPR_RM(p_slot->ctrl)) {

		ret = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);

		if (ret || !getstatus) {

			info("%s: no adapter on slot(%s)\n", __func__,
@@ -586,7 +586,7 @@ int pciehp_disable_slot(struct slot *p_slot) 
		}

	}



	if (MRL_SENS(p_slot->ctrl->ctrlcap)) {

	if (MRL_SENS(p_slot->ctrl)) {

		ret = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);

		if (ret || getstatus) {

			info("%s: latch open on slot(%s)\n", __func__,
@@ -596,7 +596,7 @@ int pciehp_disable_slot(struct slot *p_slot) 
		}

	}



	if (POWER_CTRL(p_slot->ctrl->ctrlcap)) {

	if (POWER_CTRL(p_slot->ctrl)) {

		ret = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);

		if (ret || !getstatus) {

			info("%s: already disabled slot(%s)\n", __func__,

CRA Git | Maintained and supported by SUSTech CRA and CCSE