Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80b19736 authored by Dave Jiang's avatar Dave Jiang Committed by Vinod Koul
Browse files

dmaengine: ioatdma: move all sysfs related code 



Move and fixup all sysfs related bits to sysfs.c file.

Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 885b2010

drivers/dma/ioat/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o

ioatdma-y := pci.o dma.o dma_v3.o dca.o
 
ioatdma-y := pci.o dma.o dma_v3.o dca.o sysfs.o

drivers/dma/ioat/dma.c

+0 −108
Original line number Diff line number Diff line
@@ -491,84 +491,6 @@ int ioat_register(struct ioatdma_device *ioat_dma) 
	return err;

}



static ssize_t cap_show(struct dma_chan *c, char *page)

{

	struct dma_device *dma = c->device;



	return sprintf(page, "copy%s%s%s%s%s\n",

		       dma_has_cap(DMA_PQ, dma->cap_mask) ? " pq" : "",

		       dma_has_cap(DMA_PQ_VAL, dma->cap_mask) ? " pq_val" : "",

		       dma_has_cap(DMA_XOR, dma->cap_mask) ? " xor" : "",

		       dma_has_cap(DMA_XOR_VAL, dma->cap_mask) ? " xor_val" : "",

		       dma_has_cap(DMA_INTERRUPT, dma->cap_mask) ? " intr" : "");



}

struct ioat_sysfs_entry ioat_cap_attr = __ATTR_RO(cap);



static ssize_t version_show(struct dma_chan *c, char *page)

{

	struct dma_device *dma = c->device;

	struct ioatdma_device *ioat_dma = to_ioatdma_device(dma);



	return sprintf(page, "%d.%d\n",

		       ioat_dma->version >> 4, ioat_dma->version & 0xf);

}

struct ioat_sysfs_entry ioat_version_attr = __ATTR_RO(version);



static ssize_t

ioat_attr_show(struct kobject *kobj, struct attribute *attr, char *page)

{

	struct ioat_sysfs_entry *entry;

	struct ioatdma_chan *ioat_chan;



	entry = container_of(attr, struct ioat_sysfs_entry, attr);

	ioat_chan = container_of(kobj, struct ioatdma_chan, kobj);



	if (!entry->show)

		return -EIO;

	return entry->show(&ioat_chan->dma_chan, page);

}



const struct sysfs_ops ioat_sysfs_ops = {

	.show	= ioat_attr_show,

};



void ioat_kobject_add(struct ioatdma_device *ioat_dma, struct kobj_type *type)

{

	struct dma_device *dma = &ioat_dma->dma_dev;

	struct dma_chan *c;



	list_for_each_entry(c, &dma->channels, device_node) {

		struct ioatdma_chan *ioat_chan = to_ioat_chan(c);

		struct kobject *parent = &c->dev->device.kobj;

		int err;



		err = kobject_init_and_add(&ioat_chan->kobj, type,

					   parent, "quickdata");

		if (err) {

			dev_warn(to_dev(ioat_chan),

				 "sysfs init error (%d), continuing...\n", err);

			kobject_put(&ioat_chan->kobj);

			set_bit(IOAT_KOBJ_INIT_FAIL, &ioat_chan->state);

		}

	}

}



void ioat_kobject_del(struct ioatdma_device *ioat_dma)

{

	struct dma_device *dma = &ioat_dma->dma_dev;

	struct dma_chan *c;



	list_for_each_entry(c, &dma->channels, device_node) {

		struct ioatdma_chan *ioat_chan = to_ioat_chan(c);



		if (!test_bit(IOAT_KOBJ_INIT_FAIL, &ioat_chan->state)) {

			kobject_del(&ioat_chan->kobj);

			kobject_put(&ioat_chan->kobj);

		}

	}

}



void ioat_dma_remove(struct ioatdma_device *ioat_dma)

{

	struct dma_device *dma = &ioat_dma->dma_dev;
@@ -1202,33 +1124,3 @@ ioat_dma_prep_memcpy_lock(struct dma_chan *c, dma_addr_t dma_dest, 


	return &desc->txd;

}
 


static ssize_t ring_size_show(struct dma_chan *c, char *page)

{

	struct ioatdma_chan *ioat_chan = to_ioat_chan(c);



	return sprintf(page, "%d\n", (1 << ioat_chan->alloc_order) & ~1);

}

static struct ioat_sysfs_entry ring_size_attr = __ATTR_RO(ring_size);



static ssize_t ring_active_show(struct dma_chan *c, char *page)

{

	struct ioatdma_chan *ioat_chan = to_ioat_chan(c);



	/* ...taken outside the lock, no need to be precise */

	return sprintf(page, "%d\n", ioat_ring_active(ioat_chan));

}

static struct ioat_sysfs_entry ring_active_attr = __ATTR_RO(ring_active);



static struct attribute *ioat_attrs[] = {

	&ring_size_attr.attr,

	&ring_active_attr.attr,

	&ioat_cap_attr.attr,

	&ioat_version_attr.attr,

	NULL,

};



struct kobj_type ioat_ktype = {

	.sysfs_ops = &ioat_sysfs_ops,

	.default_attrs = ioat_attrs,

};

drivers/dma/ioat/sysfs.c

0 → 100644
+135 −0
Original line number Diff line number Diff line 
/*

 * Intel I/OAT DMA Linux driver

 * Copyright(c) 2004 - 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * The full GNU General Public License is included in this distribution in

 * the file called "COPYING".

 *

 */



#include <linux/init.h>

#include <linux/module.h>

#include <linux/dmaengine.h>

#include <linux/pci.h>

#include "dma.h"

#include "registers.h"

#include "hw.h"



#include "../dmaengine.h"



static ssize_t cap_show(struct dma_chan *c, char *page)

{

	struct dma_device *dma = c->device;



	return sprintf(page, "copy%s%s%s%s%s\n",

		       dma_has_cap(DMA_PQ, dma->cap_mask) ? " pq" : "",

		       dma_has_cap(DMA_PQ_VAL, dma->cap_mask) ? " pq_val" : "",

		       dma_has_cap(DMA_XOR, dma->cap_mask) ? " xor" : "",

		       dma_has_cap(DMA_XOR_VAL, dma->cap_mask) ? " xor_val" : "",

		       dma_has_cap(DMA_INTERRUPT, dma->cap_mask) ? " intr" : "");



}

struct ioat_sysfs_entry ioat_cap_attr = __ATTR_RO(cap);



static ssize_t version_show(struct dma_chan *c, char *page)

{

	struct dma_device *dma = c->device;

	struct ioatdma_device *ioat_dma = to_ioatdma_device(dma);



	return sprintf(page, "%d.%d\n",

		       ioat_dma->version >> 4, ioat_dma->version & 0xf);

}

struct ioat_sysfs_entry ioat_version_attr = __ATTR_RO(version);



static ssize_t

ioat_attr_show(struct kobject *kobj, struct attribute *attr, char *page)

{

	struct ioat_sysfs_entry *entry;

	struct ioatdma_chan *ioat_chan;



	entry = container_of(attr, struct ioat_sysfs_entry, attr);

	ioat_chan = container_of(kobj, struct ioatdma_chan, kobj);



	if (!entry->show)

		return -EIO;

	return entry->show(&ioat_chan->dma_chan, page);

}



const struct sysfs_ops ioat_sysfs_ops = {

	.show	= ioat_attr_show,

};



void ioat_kobject_add(struct ioatdma_device *ioat_dma, struct kobj_type *type)

{

	struct dma_device *dma = &ioat_dma->dma_dev;

	struct dma_chan *c;



	list_for_each_entry(c, &dma->channels, device_node) {

		struct ioatdma_chan *ioat_chan = to_ioat_chan(c);

		struct kobject *parent = &c->dev->device.kobj;

		int err;



		err = kobject_init_and_add(&ioat_chan->kobj, type,

					   parent, "quickdata");

		if (err) {

			dev_warn(to_dev(ioat_chan),

				 "sysfs init error (%d), continuing...\n", err);

			kobject_put(&ioat_chan->kobj);

			set_bit(IOAT_KOBJ_INIT_FAIL, &ioat_chan->state);

		}

	}

}



void ioat_kobject_del(struct ioatdma_device *ioat_dma)

{

	struct dma_device *dma = &ioat_dma->dma_dev;

	struct dma_chan *c;



	list_for_each_entry(c, &dma->channels, device_node) {

		struct ioatdma_chan *ioat_chan = to_ioat_chan(c);



		if (!test_bit(IOAT_KOBJ_INIT_FAIL, &ioat_chan->state)) {

			kobject_del(&ioat_chan->kobj);

			kobject_put(&ioat_chan->kobj);

		}

	}

}



static ssize_t ring_size_show(struct dma_chan *c, char *page)

{

	struct ioatdma_chan *ioat_chan = to_ioat_chan(c);



	return sprintf(page, "%d\n", (1 << ioat_chan->alloc_order) & ~1);

}

static struct ioat_sysfs_entry ring_size_attr = __ATTR_RO(ring_size);



static ssize_t ring_active_show(struct dma_chan *c, char *page)

{

	struct ioatdma_chan *ioat_chan = to_ioat_chan(c);



	/* ...taken outside the lock, no need to be precise */

	return sprintf(page, "%d\n", ioat_ring_active(ioat_chan));

}

static struct ioat_sysfs_entry ring_active_attr = __ATTR_RO(ring_active);



static struct attribute *ioat_attrs[] = {

	&ring_size_attr.attr,

	&ring_active_attr.attr,

	&ioat_cap_attr.attr,

	&ioat_version_attr.attr,

	NULL,

};



struct kobj_type ioat_ktype = {

	.sysfs_ops = &ioat_sysfs_ops,

	.default_attrs = ioat_attrs,

};