git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] libosd: OSD version 2 Support
[safe/jmp/linux-2.6]
/
include
/
scsi
/
libsas.h
diff --git
a/include/scsi/libsas.h
b/include/scsi/libsas.h
index
df36461
..
e78d3b6
100644
(file)
--- a/
include/scsi/libsas.h
+++ b/
include/scsi/libsas.h
@@
-32,11
+32,10
@@
#include <scsi/sas.h>
#include <linux/libata.h>
#include <linux/list.h>
#include <scsi/sas.h>
#include <linux/libata.h>
#include <linux/list.h>
-#include <asm/semaphore.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_transport_sas.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_transport_sas.h>
-#include <
asm
/scatterlist.h>
+#include <
linux
/scatterlist.h>
struct block_device;
struct block_device;
@@
-91,8
+90,6
@@
enum discover_event {
/* ---------- Expander Devices ---------- */
/* ---------- Expander Devices ---------- */
-#define ETASK 0xFA
-
#define to_dom_device(_obj) container_of(_obj, struct domain_device, dev_obj)
#define to_dev_attr(_attr) container_of(_attr, struct domain_dev_attribute,\
attr)
#define to_dom_device(_obj) container_of(_obj, struct domain_device, dev_obj)
#define to_dev_attr(_attr) container_of(_attr, struct domain_dev_attribute,\
attr)
@@
-122,8
+119,8
@@
struct ex_phy {
u8 attached_sata_dev:1;
u8 attached_sata_ps:1;
u8 attached_sata_dev:1;
u8 attached_sata_ps:1;
- enum sas_proto attached_tproto;
- enum sas_proto attached_iproto;
+ enum sas_proto
col
attached_tproto;
+ enum sas_proto
col
attached_iproto;
u8 attached_sas_addr[SAS_ADDR_SIZE];
u8 attached_phy_id;
u8 attached_sas_addr[SAS_ADDR_SIZE];
u8 attached_phy_id;
@@
-191,8
+188,8
@@
struct domain_device {
struct list_head dev_list_node;
struct list_head dev_list_node;
- enum sas_proto iproto;
- enum sas_proto tproto;
+ enum sas_proto
col
iproto;
+ enum sas_proto
col
tproto;
struct sas_rphy *rphy;
struct sas_rphy *rphy;
@@
-245,8
+242,8
@@
struct asd_sas_port {
enum sas_class class;
u8 sas_addr[SAS_ADDR_SIZE];
u8 attached_sas_addr[SAS_ADDR_SIZE];
enum sas_class class;
u8 sas_addr[SAS_ADDR_SIZE];
u8 attached_sas_addr[SAS_ADDR_SIZE];
- enum sas_proto iproto;
- enum sas_proto tproto;
+ enum sas_proto
col
iproto;
+ enum sas_proto
col
tproto;
enum sas_oob_mode oob_mode;
enum sas_oob_mode oob_mode;
@@
-289,8
+286,8
@@
struct asd_sas_phy {
int id; /* must be set */
enum sas_class class;
int id; /* must be set */
enum sas_class class;
- enum sas_proto iproto;
- enum sas_proto tproto;
+ enum sas_proto
col
iproto;
+ enum sas_proto
col
tproto;
enum sas_phy_type type;
enum sas_phy_role role;
enum sas_phy_type type;
enum sas_phy_role role;
@@
-348,7
+345,7
@@
struct sas_ha_struct {
/* public: */
char *sas_ha_name;
/* public: */
char *sas_ha_name;
- struct
pci_dev *pcidev;
/* should be set */
+ struct
device *dev;
/* should be set */
struct module *lldd_module; /* should be set */
u8 *sas_addr; /* must be set */
struct module *lldd_module; /* should be set */
u8 *sas_addr; /* must be set */
@@
-537,7
+534,7
@@
struct sas_task {
spinlock_t task_state_lock;
unsigned task_state_flags;
spinlock_t task_state_lock;
unsigned task_state_flags;
- enum sas_proto task_proto;
+ enum sas_proto
col
task_proto;
/* Used by the discovery code. */
struct timer_list timer;
/* Used by the discovery code. */
struct timer_list timer;
@@
-563,7
+560,7
@@
struct sas_task {
struct work_struct abort_work;
};
struct work_struct abort_work;
};
-
+extern struct kmem_cache *sas_task_cache;
#define SAS_TASK_STATE_PENDING 1
#define SAS_TASK_STATE_DONE 2
#define SAS_TASK_STATE_PENDING 1
#define SAS_TASK_STATE_DONE 2
@@
-573,7
+570,6
@@
struct sas_task {
static inline struct sas_task *sas_alloc_task(gfp_t flags)
{
static inline struct sas_task *sas_alloc_task(gfp_t flags)
{
- extern struct kmem_cache *sas_task_cache;
struct sas_task *task = kmem_cache_zalloc(sas_task_cache, flags);
if (task) {
struct sas_task *task = kmem_cache_zalloc(sas_task_cache, flags);
if (task) {
@@
-590,7
+586,6
@@
static inline struct sas_task *sas_alloc_task(gfp_t flags)
static inline void sas_free_task(struct sas_task *task)
{
if (task) {
static inline void sas_free_task(struct sas_task *task)
{
if (task) {
- extern struct kmem_cache *sas_task_cache;
BUG_ON(!list_empty(&task->list));
kmem_cache_free(sas_task_cache, task);
}
BUG_ON(!list_empty(&task->list));
kmem_cache_free(sas_task_cache, task);
}
@@
-676,4
+671,11
@@
extern int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg);
extern int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
struct request *req);
extern int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
struct request *req);
+
+extern void sas_ssp_task_response(struct device *dev, struct sas_task *task,
+ struct ssp_response_iu *iu);
+struct sas_phy *sas_find_local_phy(struct domain_device *dev);
+
+int sas_request_addr(struct Scsi_Host *shost, u8 *addr);
+
#endif /* _SASLIB_H_ */
#endif /* _SASLIB_H_ */