Skip to content

Commit

Permalink
Staging: ipack: Provide physical memory regions to IPack devices.
Browse files Browse the repository at this point in the history
This will allow us to use the regular ioremop functions.

Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org>
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jens Taprogge authored and Greg Kroah-Hartman committed Oct 19, 2012
1 parent 6114aea commit a19ad7d
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
22 changes: 22 additions & 0 deletions drivers/staging/ipack/bridges/tpci200.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,20 @@ static const u16 tpci200_status_error[] = {
TPCI200_D_ERROR,
};

static const size_t tpci200_space_size[IPACK_SPACE_COUNT] = {
[IPACK_IO_SPACE] = TPCI200_IO_SPACE_SIZE,
[IPACK_ID_SPACE] = TPCI200_ID_SPACE_SIZE,
[IPACK_INT_SPACE] = TPCI200_INT_SPACE_SIZE,
[IPACK_MEM_SPACE] = TPCI200_MEM8_SPACE_SIZE,
};

static const size_t tpci200_space_interval[IPACK_SPACE_COUNT] = {
[IPACK_IO_SPACE] = TPCI200_IO_SPACE_INTERVAL,
[IPACK_ID_SPACE] = TPCI200_ID_SPACE_INTERVAL,
[IPACK_INT_SPACE] = TPCI200_INT_SPACE_INTERVAL,
[IPACK_MEM_SPACE] = TPCI200_MEM8_SPACE_INTERVAL,
};

static struct tpci200_board *check_slot(struct ipack_device *dev)
{
struct tpci200_board *tpci200;
Expand Down Expand Up @@ -642,13 +656,21 @@ static void tpci200_release_device(struct ipack_device *dev)

static int tpci200_create_device(struct tpci200_board *tpci200, int i)
{
enum ipack_space space;
struct ipack_device *dev =
kzalloc(sizeof(struct ipack_device), GFP_KERNEL);
if (!dev)
return -ENOMEM;
dev->slot = i;
dev->bus = tpci200->info->ipack_bus;
dev->release = tpci200_release_device;

for (space = 0; space < IPACK_SPACE_COUNT; space++) {
dev->region[space].start =
tpci200->mod_mem[space]
+ tpci200_space_interval[space] * i;
dev->region[space].size = tpci200_space_size[space];
}
return ipack_device_register(dev);
}

Expand Down
6 changes: 4 additions & 2 deletions drivers/staging/ipack/ipack.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ struct ipack_device {
struct ipack_addr_space mem_space;
struct device dev;
void (*release) (struct ipack_device *dev);
struct ipack_region region[IPACK_SPACE_COUNT];
u8 *id;
size_t id_avail;
u32 id_vendor;
Expand Down Expand Up @@ -195,8 +196,9 @@ void ipack_driver_unregister(struct ipack_driver *edrv);
*
* Register a new IPack device ("module" in IndustryPack jargon). The call
* is done by the carrier driver. The carrier should populate the fields
* bus and slot of @dev prior to calling this function. The rest of the
* fields will be allocated and populated during registration.
* bus and slot as well as the region array of @dev prior to calling this
* function. The rest of the fields will be allocated and populated
* during registration.
*
* Return zero on success or error code on failure.
*/
Expand Down

0 comments on commit a19ad7d

Please sign in to comment.