Skip to content

Commit

Permalink
drivers/fsi: expose direct-access slave API
Browse files Browse the repository at this point in the history 
Allow drivers to access the slave address ranges.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Christopher Bostic <cbostic@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jeremy Kerr authored and Greg Kroah-Hartman committed Jun 9, 2017
1 parent 125739c commit da36cad
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 6 deletions.
30 changes: 24 additions & 6 deletions drivers/fsi/fsi-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ static int fsi_master_read(struct fsi_master *master, int link,
uint8_t slave_id, uint32_t addr, void *val, size_t size);
static int fsi_master_write(struct fsi_master *master, int link,
uint8_t slave_id, uint32_t addr, const void *val, size_t size);
static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,
void *val, size_t size);
static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr,
const void *val, size_t size);

/*
* fsi_device_read() / fsi_device_write() / fsi_device_peek()
Expand Down Expand Up @@ -174,7 +170,7 @@ static int fsi_slave_calc_addr(struct fsi_slave *slave, uint32_t *addrp,
return 0;
}

static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,
int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,
void *val, size_t size)
{
uint8_t id = slave->id;
Expand All @@ -187,8 +183,9 @@ static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,
return fsi_master_read(slave->master, slave->link, id,
addr, val, size);
}
EXPORT_SYMBOL_GPL(fsi_slave_read);

static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr,
int fsi_slave_write(struct fsi_slave *slave, uint32_t addr,
const void *val, size_t size)
{
uint8_t id = slave->id;
Expand All @@ -201,6 +198,27 @@ static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr,
return fsi_master_write(slave->master, slave->link, id,
addr, val, size);
}
EXPORT_SYMBOL_GPL(fsi_slave_write);

extern int fsi_slave_claim_range(struct fsi_slave *slave,
uint32_t addr, uint32_t size)
{
if (addr + size < addr)
return -EINVAL;

if (addr + size > slave->size)
return -EINVAL;

/* todo: check for overlapping claims */
return 0;
}
EXPORT_SYMBOL_GPL(fsi_slave_claim_range);

extern void fsi_slave_release_range(struct fsi_slave *slave,
uint32_t addr, uint32_t size)
{
}
EXPORT_SYMBOL_GPL(fsi_slave_release_range);

static int fsi_slave_scan(struct fsi_slave *slave)
{
Expand Down
12 changes: 12 additions & 0 deletions include/linux/fsi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,18 @@ extern void fsi_driver_unregister(struct fsi_driver *fsi_drv);
module_driver(__fsi_driver, fsi_driver_register, \
fsi_driver_unregister)

/* direct slave API */
extern int fsi_slave_claim_range(struct fsi_slave *slave,
uint32_t addr, uint32_t size);
extern void fsi_slave_release_range(struct fsi_slave *slave,
uint32_t addr, uint32_t size);
extern int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,
void *val, size_t size);
extern int fsi_slave_write(struct fsi_slave *slave, uint32_t addr,
const void *val, size_t size);



extern struct bus_type fsi_bus_type;

#endif /* LINUX_FSI_H */

0 comments on commit da36cad

Please sign in to comment.