Skip to content

L
linux
Commit 64c6be0e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger
Browse files
Options

spear13xx_pcie_gadget: use per-attribute show and store methods 

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarPratyush Anand <pratyush.anand@gmail.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 9ae0f367
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 145 deletions
drivers/misc/spear13xx_pcie_gadget.c
View file @ 64c6be0e
...@@ -220,11 +220,17 @@ static irqreturn_t spear_pcie_gadget_irq(int irq, void *dev_id) ...@@ -220,11 +220,17 @@ static irqreturn_t spear_pcie_gadget_irq(int irq, void *dev_id)
/* /*
* configfs interfaces show/store functions * configfs interfaces show/store functions
*/ */
static ssize_t pcie_gadget_show_link(
struct spear_pcie_gadget_config *config, static struct pcie_gadget_target *to_target(struct config_item *item)
char *buf)
{ {
struct pcie_app_reg __iomem *app_reg = config->va_app_base; return item ?
container_of(to_configfs_subsystem(to_config_group(item)),
struct pcie_gadget_target, subsys) : NULL;
}
static ssize_t pcie_gadget_link_show(struct config_item *item, char *buf)
{
struct pcie_app_reg __iomem *app_reg = to_target(item)->va_app_base;
if (readl(&app_reg->app_status_1) & ((u32)1 << XMLH_LINK_UP_ID)) if (readl(&app_reg->app_status_1) & ((u32)1 << XMLH_LINK_UP_ID))
return sprintf(buf, "UP"); return sprintf(buf, "UP");
...@@ -232,11 +238,10 @@ static ssize_t pcie_gadget_show_link( ...@@ -232,11 +238,10 @@ static ssize_t pcie_gadget_show_link(
return sprintf(buf, "DOWN"); return sprintf(buf, "DOWN");
} }
static ssize_t pcie_gadget_store_link( static ssize_t pcie_gadget_link_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct pcie_app_reg __iomem *app_reg = config->va_app_base; struct pcie_app_reg __iomem *app_reg = to_target(item)->va_app_base;
if (sysfs_streq(buf, "UP")) if (sysfs_streq(buf, "UP"))
writel(readl(&app_reg->app_ctrl_0) | (1 << APP_LTSSM_ENABLE_ID), writel(readl(&app_reg->app_ctrl_0) | (1 << APP_LTSSM_ENABLE_ID),
...@@ -250,17 +255,15 @@ static ssize_t pcie_gadget_store_link( ...@@ -250,17 +255,15 @@ static ssize_t pcie_gadget_store_link(
return count; return count;
} }
static ssize_t pcie_gadget_show_int_type( static ssize_t pcie_gadget_int_type_show(struct config_item *item, char *buf)
struct spear_pcie_gadget_config *config,
char *buf)
{ {
return sprintf(buf, "%s", config->int_type); return sprintf(buf, "%s", to_target(item)->int_type);
} }
static ssize_t pcie_gadget_store_int_type( static ssize_t pcie_gadget_int_type_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct spear_pcie_gadget_config *config = to_target(item)
u32 cap, vec, flags; u32 cap, vec, flags;
ulong vector; ulong vector;
...@@ -288,11 +291,10 @@ static ssize_t pcie_gadget_store_int_type( ...@@ -288,11 +291,10 @@ static ssize_t pcie_gadget_store_int_type(
return count; return count;
} }
static ssize_t pcie_gadget_show_no_of_msi( static ssize_t pcie_gadget_no_of_msi_show(struct config_item *item, char *buf)
struct spear_pcie_gadget_config *config,
char *buf)
{ {
struct pcie_app_reg __iomem *app_reg = config->va_app_base; struct spear_pcie_gadget_config *config = to_target(item)
struct pcie_app_reg __iomem *app_reg = to_target(item)->va_app_base;
u32 cap, vec, flags; u32 cap, vec, flags;
ulong vector; ulong vector;
...@@ -313,13 +315,12 @@ static ssize_t pcie_gadget_show_no_of_msi( ...@@ -313,13 +315,12 @@ static ssize_t pcie_gadget_show_no_of_msi(
return sprintf(buf, "%lu", vector); return sprintf(buf, "%lu", vector);
} }
static ssize_t pcie_gadget_store_no_of_msi( static ssize_t pcie_gadget_no_of_msi_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
int ret; int ret;
ret = kstrtoul(buf, 0, &config->requested_msi); ret = kstrtoul(buf, 0, &to_target(item)->requested_msi);
if (ret) if (ret)
return ret; return ret;
...@@ -329,11 +330,10 @@ static ssize_t pcie_gadget_store_no_of_msi( ...@@ -329,11 +330,10 @@ static ssize_t pcie_gadget_store_no_of_msi(
return count; return count;
} }
static ssize_t pcie_gadget_store_inta( static ssize_t pcie_gadget_inta_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct pcie_app_reg __iomem *app_reg = config->va_app_base; struct pcie_app_reg __iomem *app_reg = to_target(item)->va_app_base;
ulong en; ulong en;
int ret; int ret;
...@@ -351,10 +351,10 @@ static ssize_t pcie_gadget_store_inta( ...@@ -351,10 +351,10 @@ static ssize_t pcie_gadget_store_inta(
return count; return count;
} }
static ssize_t pcie_gadget_store_send_msi( static ssize_t pcie_gadget_send_msi_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct spear_pcie_gadget_config *config = to_target(item)
struct pcie_app_reg __iomem *app_reg = config->va_app_base; struct pcie_app_reg __iomem *app_reg = config->va_app_base;
ulong vector; ulong vector;
u32 ven_msi; u32 ven_msi;
...@@ -388,19 +388,16 @@ static ssize_t pcie_gadget_store_send_msi( ...@@ -388,19 +388,16 @@ static ssize_t pcie_gadget_store_send_msi(
return count; return count;
} }
static ssize_t pcie_gadget_show_vendor_id( static ssize_t pcie_gadget_vendor_id_show(struct config_item *item, char *buf)
struct spear_pcie_gadget_config *config,
char *buf)
{ {
u32 id; u32 id;
spear_dbi_read_reg(config, PCI_VENDOR_ID, 2, &id); spear_dbi_read_reg(to_target(item), PCI_VENDOR_ID, 2, &id);
return sprintf(buf, "%x", id); return sprintf(buf, "%x", id);
} }
static ssize_t pcie_gadget_store_vendor_id( static ssize_t pcie_gadget_vendor_id_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
ulong id; ulong id;
...@@ -410,24 +407,21 @@ static ssize_t pcie_gadget_store_vendor_id( ...@@ -410,24 +407,21 @@ static ssize_t pcie_gadget_store_vendor_id(
if (ret) if (ret)
return ret; return ret;
spear_dbi_write_reg(config, PCI_VENDOR_ID, 2, id); spear_dbi_write_reg(to_target(item), PCI_VENDOR_ID, 2, id);
return count; return count;
} }
static ssize_t pcie_gadget_show_device_id( static ssize_t pcie_gadget_device_id_show(struct config_item *item, char *buf)
struct spear_pcie_gadget_config *config,
char *buf)
{ {
u32 id; u32 id;
spear_dbi_read_reg(config, PCI_DEVICE_ID, 2, &id); spear_dbi_read_reg(to_target(item), PCI_DEVICE_ID, 2, &id);
return sprintf(buf, "%x", id); return sprintf(buf, "%x", id);
} }
static ssize_t pcie_gadget_store_device_id( static ssize_t pcie_gadget_device_id_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
ulong id; ulong id;
...@@ -437,22 +431,20 @@ static ssize_t pcie_gadget_store_device_id( ...@@ -437,22 +431,20 @@ static ssize_t pcie_gadget_store_device_id(
if (ret) if (ret)
return ret; return ret;
spear_dbi_write_reg(config, PCI_DEVICE_ID, 2, id); spear_dbi_write_reg(to_target(item), PCI_DEVICE_ID, 2, id);
return count; return count;
} }
static ssize_t pcie_gadget_show_bar0_size( static ssize_t pcie_gadget_bar0_size_show(struct config_item *item, char *buf)
struct spear_pcie_gadget_config *config,
char *buf)
{ {
return sprintf(buf, "%lx", config->bar0_size); return sprintf(buf, "%lx", to_target(item)->bar0_size);
} }
static ssize_t pcie_gadget_store_bar0_size( static ssize_t pcie_gadget_bar0_size_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct spear_pcie_gadget_config *config = to_target(item)
ulong size; ulong size;
u32 pos, pos1; u32 pos, pos1;
u32 no_of_bit = 0; u32 no_of_bit = 0;
...@@ -489,21 +481,20 @@ static ssize_t pcie_gadget_store_bar0_size( ...@@ -489,21 +481,20 @@ static ssize_t pcie_gadget_store_bar0_size(
return count; return count;
} }
static ssize_t pcie_gadget_show_bar0_address( static ssize_t pcie_gadget_bar0_address_show(struct config_item *item,
struct spear_pcie_gadget_config *config,
char *buf) char *buf)
{ {
struct pcie_app_reg __iomem *app_reg = config->va_app_base; struct pcie_app_reg __iomem *app_reg = to_target(item)->va_app_base;
u32 address = readl(&app_reg->pim0_mem_addr_start); u32 address = readl(&app_reg->pim0_mem_addr_start);
return sprintf(buf, "%x", address); return sprintf(buf, "%x", address);
} }
static ssize_t pcie_gadget_store_bar0_address( static ssize_t pcie_gadget_bar0_address_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct spear_pcie_gadget_config *config = to_target(item)
struct pcie_app_reg __iomem *app_reg = config->va_app_base; struct pcie_app_reg __iomem *app_reg = config->va_app_base;
ulong address; ulong address;
int ret; int ret;
...@@ -524,15 +515,13 @@ static ssize_t pcie_gadget_store_bar0_address( ...@@ -524,15 +515,13 @@ static ssize_t pcie_gadget_store_bar0_address(
return count; return count;
} }
static ssize_t pcie_gadget_show_bar0_rw_offset( static ssize_t pcie_gadget_bar0_rw_offset_show(struct config_item *item,
struct spear_pcie_gadget_config *config,
char *buf) char *buf)
{ {
return sprintf(buf, "%lx", config->bar0_rw_offset); return sprintf(buf, "%lx", to_target(item)->bar0_rw_offset);
} }
static ssize_t pcie_gadget_store_bar0_rw_offset( static ssize_t pcie_gadget_bar0_rw_offset_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
ulong offset; ulong offset;
...@@ -545,15 +534,14 @@ static ssize_t pcie_gadget_store_bar0_rw_offset( ...@@ -545,15 +534,14 @@ static ssize_t pcie_gadget_store_bar0_rw_offset(
if (offset % 4) if (offset % 4)
return -EINVAL; return -EINVAL;
config->bar0_rw_offset = offset; to_target(item)->bar0_rw_offset = offset;
return count; return count;
} }
static ssize_t pcie_gadget_show_bar0_data( static ssize_t pcie_gadget_bar0_data_show(struct config_item *item, char *buf)
struct spear_pcie_gadget_config *config,
char *buf)
{ {
struct spear_pcie_gadget_config *config = to_target(item)
ulong data; ulong data;
if (!config->va_bar0_address) if (!config->va_bar0_address)
...@@ -564,10 +552,10 @@ static ssize_t pcie_gadget_show_bar0_data( ...@@ -564,10 +552,10 @@ static ssize_t pcie_gadget_show_bar0_data(
return sprintf(buf, "%lx", data); return sprintf(buf, "%lx", data);
} }
static ssize_t pcie_gadget_store_bar0_data( static ssize_t pcie_gadget_bar0_data_store(struct config_item *item,
struct spear_pcie_gadget_config *config,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct spear_pcie_gadget_config *config = to_target(item)
ulong data; ulong data;
int ret; int ret;
...@@ -583,97 +571,35 @@ static ssize_t pcie_gadget_store_bar0_data( ...@@ -583,97 +571,35 @@ static ssize_t pcie_gadget_store_bar0_data(
return count; return count;
} }
/* CONFIGFS_ATTR(pcie_gadget_, link);
* Attribute definitions. CONFIGFS_ATTR(pcie_gadget_, int_type);
*/ CONFIGFS_ATTR(pcie_gadget_, no_of_msi);
CONFIGFS_ATTR_WO(pcie_gadget_, inta);
#define PCIE_GADGET_TARGET_ATTR_RO(_name) \ CONFIGFS_ATTR_WO(pcie_gadget_, send_msi);
static struct pcie_gadget_target_attr pcie_gadget_target_##_name = \ CONFIGFS_ATTR(pcie_gadget_, vendor_id);
__CONFIGFS_ATTR(_name, S_IRUGO, pcie_gadget_show_##_name, NULL) CONFIGFS_ATTR(pcie_gadget_, device_id);
CONFIGFS_ATTR(pcie_gadget_, bar0_size);
#define PCIE_GADGET_TARGET_ATTR_WO(_name) \ CONFIGFS_ATTR(pcie_gadget_, bar0_address);
static struct pcie_gadget_target_attr pcie_gadget_target_##_name = \ CONFIGFS_ATTR(pcie_gadget_, bar0_rw_offset);
__CONFIGFS_ATTR(_name, S_IWUSR, NULL, pcie_gadget_store_##_name) CONFIGFS_ATTR(pcie_gadget_, bar0_data);
#define PCIE_GADGET_TARGET_ATTR_RW(_name) \
static struct pcie_gadget_target_attr pcie_gadget_target_##_name = \
__CONFIGFS_ATTR(_name, S_IRUGO | S_IWUSR, pcie_gadget_show_##_name, \
pcie_gadget_store_##_name)
PCIE_GADGET_TARGET_ATTR_RW(link);
PCIE_GADGET_TARGET_ATTR_RW(int_type);
PCIE_GADGET_TARGET_ATTR_RW(no_of_msi);
PCIE_GADGET_TARGET_ATTR_WO(inta);
PCIE_GADGET_TARGET_ATTR_WO(send_msi);
PCIE_GADGET_TARGET_ATTR_RW(vendor_id);
PCIE_GADGET_TARGET_ATTR_RW(device_id);
PCIE_GADGET_TARGET_ATTR_RW(bar0_size);
PCIE_GADGET_TARGET_ATTR_RW(bar0_address);
PCIE_GADGET_TARGET_ATTR_RW(bar0_rw_offset);
PCIE_GADGET_TARGET_ATTR_RW(bar0_data);
static struct configfs_attribute *pcie_gadget_target_attrs[] = { static struct configfs_attribute *pcie_gadget_target_attrs[] = {
&pcie_gadget_target_link.attr, &pcie_gadget_attr_link,
&pcie_gadget_target_int_type.attr, &pcie_gadget_attr_int_type,
&pcie_gadget_target_no_of_msi.attr, &pcie_gadget_attr_no_of_msi,
&pcie_gadget_target_inta.attr, &pcie_gadget_attr_inta,
&pcie_gadget_target_send_msi.attr, &pcie_gadget_attr_send_msi,
&pcie_gadget_target_vendor_id.attr, &pcie_gadget_attr_vendor_id,
&pcie_gadget_target_device_id.attr, &pcie_gadget_attr_device_id,
&pcie_gadget_target_bar0_size.attr, &pcie_gadget_attr_bar0_size,
&pcie_gadget_target_bar0_address.attr, &pcie_gadget_attr_bar0_address,
&pcie_gadget_target_bar0_rw_offset.attr, &pcie_gadget_attr_bar0_rw_offset,
&pcie_gadget_target_bar0_data.attr, &pcie_gadget_attr_bar0_data,
NULL, NULL,
}; };
static struct pcie_gadget_target *to_target(struct config_item *item)
{
return item ?
container_of(to_configfs_subsystem(to_config_group(item)),
struct pcie_gadget_target, subsys) : NULL;
}
/*
* Item operations and type for pcie_gadget_target.
*/
static ssize_t pcie_gadget_target_attr_show(struct config_item *item,
struct configfs_attribute *attr,
char *buf)
{
ssize_t ret = -EINVAL;
struct pcie_gadget_target *target = to_target(item);
struct pcie_gadget_target_attr *t_attr =
container_of(attr, struct pcie_gadget_target_attr, attr);
if (t_attr->show)
ret = t_attr->show(&target->config, buf);
return ret;
}
static ssize_t pcie_gadget_target_attr_store(struct config_item *item,
struct configfs_attribute *attr,
const char *buf,
size_t count)
{
ssize_t ret = -EINVAL;
struct pcie_gadget_target *target = to_target(item);
struct pcie_gadget_target_attr *t_attr =
container_of(attr, struct pcie_gadget_target_attr, attr);
if (t_attr->store)
ret = t_attr->store(&target->config, buf, count);
return ret;
}
static struct configfs_item_operations pcie_gadget_target_item_ops = {
.show_attribute = pcie_gadget_target_attr_show,
.store_attribute = pcie_gadget_target_attr_store,
};
static struct config_item_type pcie_gadget_target_type = { static struct config_item_type pcie_gadget_target_type = {
.ct_attrs = pcie_gadget_target_attrs, .ct_attrs = pcie_gadget_target_attrs,
.ct_item_ops = &pcie_gadget_target_item_ops,
.ct_owner = THIS_MODULE, .ct_owner = THIS_MODULE,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7