diff options
Diffstat (limited to 'drivers/rapidio')
| -rw-r--r-- | drivers/rapidio/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/rapidio/devices/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/rapidio/devices/rio_mport_cdev.c | 32 | ||||
| -rw-r--r-- | drivers/rapidio/rio-scan.c | 2 | ||||
| -rw-r--r-- | drivers/rapidio/switches/Kconfig | 10 |
5 files changed, 26 insertions, 24 deletions
diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig index 677d1aff61b7..e4c422d806be 100644 --- a/drivers/rapidio/Kconfig +++ b/drivers/rapidio/Kconfig @@ -19,14 +19,14 @@ config RAPIDIO_DISC_TIMEOUT int "Discovery timeout duration (seconds)" depends on RAPIDIO default "30" - ---help--- + help Amount of time a discovery node waits for a host to complete enumeration before giving up. config RAPIDIO_ENABLE_RX_TX_PORTS bool "Enable RapidIO Input/Output Ports" depends on RAPIDIO - ---help--- + help The RapidIO specification describes a Output port transmit enable and a Input port receive enable. The recommended state for Input ports and Output ports should be disabled. When diff --git a/drivers/rapidio/devices/Kconfig b/drivers/rapidio/devices/Kconfig index 9a195654b0ca..c416531ad7c8 100644 --- a/drivers/rapidio/devices/Kconfig +++ b/drivers/rapidio/devices/Kconfig @@ -7,5 +7,5 @@ config RAPIDIO_TSI721 tristate "IDT Tsi721 PCI Express SRIO Controller support" depends on RAPIDIO && PCIEPORTBUS default "n" - ---help--- + help Include support for IDT Tsi721 PCI Express Serial RapidIO controller. diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c index 8155f59ece38..451608e960a1 100644 --- a/drivers/rapidio/devices/rio_mport_cdev.c +++ b/drivers/rapidio/devices/rio_mport_cdev.c @@ -572,14 +572,12 @@ static void dma_req_free(struct kref *ref) struct mport_dma_req *req = container_of(ref, struct mport_dma_req, refcount); struct mport_cdev_priv *priv = req->priv; - unsigned int i; dma_unmap_sg(req->dmach->device->dev, req->sgt.sgl, req->sgt.nents, req->dir); sg_free_table(&req->sgt); if (req->page_list) { - for (i = 0; i < req->nr_pages; i++) - put_page(req->page_list[i]); + unpin_user_pages(req->page_list, req->nr_pages); kfree(req->page_list); } @@ -815,7 +813,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, struct mport_dma_req *req; struct mport_dev *md = priv->md; struct dma_chan *chan; - int i, ret; + int ret; int nents; if (xfer->length == 0) @@ -862,7 +860,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, goto err_req; } - pinned = get_user_pages_fast( + pinned = pin_user_pages_fast( (unsigned long)xfer->loc_addr & PAGE_MASK, nr_pages, dir == DMA_FROM_DEVICE ? FOLL_WRITE : 0, @@ -870,13 +868,18 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, if (pinned != nr_pages) { if (pinned < 0) { - rmcd_error("get_user_pages_unlocked err=%ld", + rmcd_error("pin_user_pages_fast err=%ld", pinned); nr_pages = 0; } else rmcd_error("pinned %ld out of %ld pages", pinned, nr_pages); ret = -EFAULT; + /* + * Set nr_pages up to mean "how many pages to unpin, in + * the error handler: + */ + nr_pages = pinned; goto err_pg; } @@ -946,8 +949,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, err_pg: if (!req->page_list) { - for (i = 0; i < nr_pages; i++) - put_page(page_list[i]); + unpin_user_pages(page_list, nr_pages); kfree(page_list); } err_req: @@ -2379,13 +2381,6 @@ static struct mport_dev *mport_cdev_add(struct rio_mport *mport) cdev_init(&md->cdev, &mport_fops); md->cdev.owner = THIS_MODULE; - ret = cdev_device_add(&md->cdev, &md->dev); - if (ret) { - rmcd_error("Failed to register mport %d (err=%d)", - mport->id, ret); - goto err_cdev; - } - INIT_LIST_HEAD(&md->doorbells); spin_lock_init(&md->db_lock); INIT_LIST_HEAD(&md->portwrites); @@ -2405,6 +2400,13 @@ static struct mport_dev *mport_cdev_add(struct rio_mport *mport) #else md->properties.transfer_mode |= RIO_TRANSFER_MODE_TRANSFER; #endif + + ret = cdev_device_add(&md->cdev, &md->dev); + if (ret) { + rmcd_error("Failed to register mport %d (err=%d)", + mport->id, ret); + goto err_cdev; + } ret = rio_query_mport(mport, &attr); if (!ret) { md->properties.flags = attr.flags; diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c index 0e90c5d4bb2b..eb8ed28533f8 100644 --- a/drivers/rapidio/rio-scan.c +++ b/drivers/rapidio/rio-scan.c @@ -39,7 +39,7 @@ struct rio_id_table { u16 start; /* logical minimal id */ u32 max; /* max number of IDs in table */ spinlock_t lock; - unsigned long table[0]; + unsigned long table[]; }; static int next_destid = 0; diff --git a/drivers/rapidio/switches/Kconfig b/drivers/rapidio/switches/Kconfig index c1eb9cb899b1..3e18f9c51e29 100644 --- a/drivers/rapidio/switches/Kconfig +++ b/drivers/rapidio/switches/Kconfig @@ -4,28 +4,28 @@ # config RAPIDIO_TSI57X tristate "IDT Tsi57x SRIO switches support" - ---help--- + help Includes support for IDT Tsi57x family of serial RapidIO switches. config RAPIDIO_CPS_XX tristate "IDT CPS-xx SRIO switches support" - ---help--- + help Includes support for IDT CPS-16/12/10/8 serial RapidIO switches. config RAPIDIO_TSI568 tristate "Tsi568 SRIO switch support" default n - ---help--- + help Includes support for IDT Tsi568 serial RapidIO switch. config RAPIDIO_CPS_GEN2 tristate "IDT CPS Gen.2 SRIO switch support" default n - ---help--- + help Includes support for ITD CPS Gen.2 serial RapidIO switches. config RAPIDIO_RXS_GEN3 tristate "IDT RXS Gen.3 SRIO switch support" default n - ---help--- + help Includes support for ITD RXS Gen.3 serial RapidIO switches. |