http://blog.gmane.org/gmane.linux.scsi hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.linux.scsi/46428 Greetings Tomo-san and Co, With the ongoing work in Linux/SCSI for v2.6.28 to map target mode struct scatterlist memory directly down to struct scsi_cmnd without the need for a intermediate struct bio as with the existing scsi_execute_async(), I have started the porting process for the Linux/SCSI subsystem plugin in generic target core v3.0 (lio-core-2.6.git) on v2.6.28-rc6. So far, using struct request for ICF_SCSI_CONTROL_NONSG_IO_CDB is up using blk_rq_map_kern(), as well as ICF_SCSI_NON_DATA_CDB ops using struct request. In order to get the first READ_10s of type ICF_SCSI_DATA_SG_IO_CDB to work, I had to add a temporary EXPORT_SYMBOL_GPL() for drivers/scsi/scsi_lib.c:scsi_req_map_sg() in lio-core-2.6.git for v2.6.28-rc6 in order to get TYPE_DISK up using an software emulated MPT-Fusion HBA driver with struct request. I have been looking at drivers/scsi/scsi_tgt_lib.c() (which currently uses struct request), and I figure we need something similar for the generic target infrastructure, although __scsi_get_command() and __scsi_put_command() are currently used in that code. Below is what my patch looks like so far, I will probably just end up commiting an temporary ifdef to keep scsi_execute_async() until the proper pieces are in place and the other issues are resolved below. for struct scatterlist in drivers/lio-core/target_core_pscsi.c:pscsi_map_task_SG() get rid of scsi_req_map_sg() usage all together. So far during my initial testing, I am running into a two different exceptions. One NULL pointer deference OOPS after half dozen Open/iSCSI login/logouts in block/elevator.c:elv_dequeue_request(). Here is the trace from SCSI softirq context: http://linux-iscsi.org/builds/user/nab/2.6.28-rc6-oops-0.png http://linux-iscsi.org/builds/user/nab/2.6.28-rc6-oops-1.png The other one is a BUG_ON in blk/blk-timeout.c:177 in blk_add_timeout() that happens after a few hundred MB of READ_10 traffic, which also appears to pass through elv_dequeue_request() at some point: http://linux-iscsi.org/builds/user/nab/2.6.28-rc6-oops-2.png http://linux-iscsi.org/builds/user/nab/2.6.28-rc6-oops-4.png Tomo, Boaz, Jens, any comments..? --nab diff --git a/drivers/lio-core/target_core_pscsi.c b/drivers/lio-core/target_core_pscsi.c index ed9f588..5161483 100644 --- a/drivers/lio-core/target_core_pscsi.c +++ b/drivers/lio-core/target_core_pscsi.c < at >< at > -37,6 +37,7 < at >< at > #include <linux/spinlock.h> #include <linux/smp_lock.h> #include <linux/genhd.h> +#include <linux/cdrom.h> #include <linux/file.h> #include <scsi/scsi.h> < at >< at > -44,6 +45,7 < at >< at > #include <scsi/scsi_cmnd.h> #include <scsi/scsi_host.h> #include <sd.h> +#include <sr.h> #include <iscsi_linux_os.h> #include <iscsi_linux_defs.h> < at >< at > -763,11 +765,11 < at >< at > extern void *pscsi_allocate_request ( se_device_t *dev) { pscsi_plugin_task_t *pt; -if (!(pt = kmalloc(sizeof(pscsi_plugin_task_t), GFP_KERNEL))) { -TRACE_ERROR("Unable to allocate pscsi_plugin_task_t\n"); + +if (!(pt = kzalloc(sizeof(pscsi_plugin_task_t), GFP_KERNEL))) { +printk(KERN_ERR "Unable to allocate pscsi_plugin_task_t\n"); return(NULL); } -memset(pt, 0, sizeof(pscsi_plugin_task_t)); return(pt); } < at >< at > -788,7 +790,44 < at >< at > extern void pscsi_get_evpd_sn (unsigned char *buf, u32 size, se_device_t *dev) return; } -/*pscsi_do_task(): (Part of se_subsystem_api_t template) +static int pscsi_blk_get_request (se_task_t *task) +{ +pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; +pscsi_dev_virt_t *pdv = (pscsi_dev_virt_t *) task->iscsi_dev->dev_ptr; + +pt->pscsi_req = blk_get_request(pdv->pdv_sd->request_queue, +(pt->pscsi_direction == DMA_TO_DEVICE), GFP_KERNEL); +if (!(pt->pscsi_req) || IS_ERR(pt->pscsi_req)) { +printk(KERN_ERR "PSCSI: blk_get_request() failed: %ld\n", +IS_ERR(pt->pscsi_req)); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} +/* + * Defined as "scsi command" in include/linux/blkdev.h. + */ +pt->pscsi_req->cmd_type = REQ_TYPE_BLOCK_PC; +/* + * Setup the done function pointer for struct request, + * also set the end_io_data pointer.to se_task_t. + */ +pt->pscsi_req->end_io = pscsi_req_done; +pt->pscsi_req->end_io_data = (void *)task; +/* + * Load the referenced se_task_t's SCSI CDB into + * include/linux/blkdev.h:struct request->cmd + */ +pt->pscsi_req->cmd_len = COMMAND_SIZE(pt->pscsi_cdb[0]); +memcpy(pt->pscsi_req->cmd, pt->pscsi_cdb, pt->pscsi_req->cmd_len); +/* + * Setup pointer for outgoing sense data. + */ +pt->pscsi_req->sense = (void *)&pt->pscsi_sense[0]; +pt->pscsi_req->sense_len = 0; + +return(0); +} + +/* pscsi_do_task(): (Part of se_subsystem_api_t template) * * */ < at >< at > -796,17 +835,32 < at >< at > extern int pscsi_do_task (se_task_t *task) { pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pscsi_dev_virt_t *pdv = (pscsi_dev_virt_t *) task->iscsi_dev->dev_ptr; -int ret; - -if ((ret = scsi_execute_async((struct scsi_device *)pdv->pdv_sd, - pt->pscsi_cdb, COMMAND_SIZE(pt->pscsi_cdb[0]), pt->pscsi_direction, - pt->pscsi_buf, task->task_size, task->task_sg_num, - (task->se_obj_api->get_device_type(task->se_obj_ptr) == 0) ? - PS_TIMEOUT_DISK : PS_TIMEOUT_OTHER, PS_RETRY, - (void *)task, pscsi_req_done, GFP_KERNEL)) != 0) { -TRACE_ERROR("PSCSI Execute(): returned: %d\n", ret); -return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); -} +struct gendisk *gd = NULL; +/* + * Grab pointer to struct gendisk for TYPE_DISK and TYPE_ROM + * cases (eg: cases where struct scsi_device has a backing + * struct block_device. Also set the struct request->timeout + * value based on peripheral device type (from SCSI). + */ +if (pdv->pdv_sd->type == TYPE_DISK) { +struct scsi_disk *sdisk = dev_get_drvdata( +&pdv->pdv_sd->sdev_gendev); +gd = sdisk->disk; +pt->pscsi_req->timeout = PS_TIMEOUT_DISK; +} else if (pdv->pdv_sd->type == TYPE_ROM) { +struct scsi_cd *scd = dev_get_drvdata( +&pdv->pdv_sd->sdev_gendev); +gd = scd->disk; +pt->pscsi_req->timeout = PS_TIMEOUT_OTHER; +} else +pt->pscsi_req->timeout = PS_TIMEOUT_OTHER; + +pt->pscsi_req->retries = PS_RETRY; +/* + * Queue the struct request into the struct scsi_device->request_queue. + */ +blk_execute_rq_nowait(pdv->pdv_sd->request_queue, gd, + pt->pscsi_req, 1, pscsi_req_done); return(PYX_TRANSPORT_SENT_TO_TRANSPORT); } < at >< at > -817,7 +871,14 < at >< at > extern int pscsi_do_task (se_task_t *task) */ extern void pscsi_free_task (se_task_t *task) { -kfree(task->transport_req); +pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; + +if (pt->pscsi_req) { +blk_put_request(pt->pscsi_req); +pt->pscsi_req = NULL; +} + +kfree(pt); return; } < at >< at > -1099,31 +1160,65 < at >< at > extern void __pscsi_get_dev_info (pscsi_dev_virt_t *pdv, char *b, int *bl) return; } -/*pscsi_map_task_SG(): +extern int scsi_req_map_sg(struct request *, struct scatterlist *, int, unsigned , gfp_t ); + +/* pscsi_map_task_SG(): * * */ -extern void pscsi_map_task_SG (se_task_t *task) +extern int pscsi_map_task_SG (se_task_t *task) { pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; +int ret = 0; + pt->pscsi_buf = (void *)task->task_buf; -return; +if (!task->task_size) +return(0); +#if 0 +if ((ret = blk_rq_map_sg(pdv->pdv_sd->request_queue, +pt->pscsi_req, +(struct scatterlist *)pt->pscsi_buf)) < 0) { +printk(KERN_ERR "PSCSI: blk_rq_map_sg() returned %d\n", ret); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} +#else +if ((ret = scsi_req_map_sg(pt->pscsi_req, +(struct scatterlist *)pt->pscsi_buf, +task->task_sg_num, task->task_size, +GFP_KERNEL)) < 0) { +printk(KERN_ERR "PSCSI: scsi_req_map_sg() failed: %d\n", ret); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} +#endif +return(0); } /*pscsi_map_task_non_SG(): * * */ -extern void pscsi_map_task_non_SG (se_task_t *task) +extern int pscsi_map_task_non_SG (se_task_t *task) { iscsi_cmd_t *cmd = task->iscsi_cmd; +pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; +pscsi_dev_virt_t *pdv = (pscsi_dev_virt_t *) task->iscsi_dev->dev_ptr; unsigned char *buf = (unsigned char *) T_TASK(cmd)->t_task_buf; +int ret = 0; -pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_buf = (void *)buf; -return; +if (!task->task_size) +return(0); + +if ((ret = blk_rq_map_kern(pdv->pdv_sd->request_queue, +pt->pscsi_req, pt->pscsi_buf, +task->task_size, GFP_KERNEL)) < 0) { +printk(KERN_ERR "PSCSI: blk_rq_map_kern() failed: %d\n", ret); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} + +return(0); } /*pscsi_CDB_inquiry(): < at >< at > -1135,9 +1230,11 < at >< at > extern int pscsi_CDB_inquiry (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_FROM_DEVICE; -pscsi_map_task_non_SG(task); + +if (pscsi_blk_get_request(task) < 0) +return(-1); -return(0); +return(pscsi_map_task_non_SG(task)); } extern int pscsi_CDB_none (se_task_t *task, u32 size) < at >< at > -1146,7 +1243,7 < at >< at > extern int pscsi_CDB_none (se_task_t *task, u32 size) pt->pscsi_direction = DMA_NONE; -return(0); +return(pscsi_blk_get_request(task)); } /*pscsi_CDB_read_non_SG(): < at >< at > -1158,9 +1255,11 < at >< at > extern int pscsi_CDB_read_non_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_FROM_DEVICE; -pscsi_map_task_non_SG(task); -return(0); +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +return(pscsi_map_task_non_SG(task)); } /*pscsi_CDB_read_SG(): < at >< at > -1172,7 +1271,12 < at >< at > extern int pscsi_CDB_read_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_FROM_DEVICE; -pscsi_map_task_SG(task); + +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +if (pscsi_map_task_SG(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); return(task->task_sg_num); } < at >< at > -1186,9 +1290,11 < at >< at > extern int pscsi_CDB_write_non_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_TO_DEVICE; -pscsi_map_task_non_SG(task); -return(0); +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +return(pscsi_map_task_non_SG(task)); } /*pscsi_CDB_write_SG(): < at >< at > -1200,7 +1306,12 < at >< at > extern int pscsi_CDB_write_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_TO_DEVICE; -pscsi_map_task_SG(task); + +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +if (pscsi_map_task_SG(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); return(task->task_sg_num); } < at >< at > -1386,22 +1497,25 < at >< at > extern void pscsi_shutdown_hba (se_hba_t *hba) * * */ -//#warning FIXME: We can do some custom handling of HBA fuckups here. -extern inline void pscsi_process_SAM_status (se_task_t *task, unsigned char *cdb, int result) +static inline void pscsi_process_SAM_status ( +se_task_t *task, +pscsi_plugin_task_t *pt) { -if ((task->task_scsi_status = status_byte(result))) { +if ((task->task_scsi_status = status_byte(pt->pscsi_result))) { task->task_scsi_status <<= 1; -PYXPRINT("Parallel SCSI Status Byte exception - ITT: 0x%08x Task: %p CDB: 0x%02x" -" Result: 0x%08x\n", task->iscsi_cmd->init_task_tag, task, cdb[0], result); +PYXPRINT("PSCSI Status Byte exception at task: %p CDB: 0x%02x" +" Result: 0x%08x\n", task, pt->pscsi_cdb[0], +pt->pscsi_result); } -switch (host_byte(result)) { +switch (host_byte(pt->pscsi_result)) { case DID_OK: transport_complete_task(task, (!task->task_scsi_status)); break; default: -PYXPRINT("Parallel SCSI Host Byte exception - ITT: 0x%08x Task: %p CDB: 0x%02x" -" Result: 0x%08x\n", task->iscsi_cmd->init_task_tag, task, cdb[0], result); +PYXPRINT("PSCSI Host Byte exception at task: %p CDB: 0x%02x" +" Result: 0x%08x\n", task, pt->pscsi_cdb[0], +pt->pscsi_result); task->task_scsi_status = SAM_STAT_CHECK_CONDITION; task->task_error_status = PYX_TRANSPORT_UNKNOWN_SAM_OPCODE; task->iscsi_cmd->transport_error_status = PYX_TRANSPORT_UNKNOWN_SAM_OPCODE; < at >< at > -1412,21 +1526,17 < at >< at > extern inline void pscsi_process_SAM_status (se_task_t *task, unsigned char *cdb return; } -extern void pscsi_req_done (void *data, char *sense, int result, int data_len) +extern void pscsi_req_done (struct request *req, int uptodate) { -se_task_t *task = (se_task_t *)data; +se_task_t *task = (se_task_t *)req->end_io_data; pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *)task->transport_req; -#if 0 -printk("pscsi_req_done(): result: %08x, sense: %p data_len: %d\n", -result, sense, data_len); -#endif -pt->pscsi_result = result; -pt->pscsi_data_len = data_len; - -if (result != 0) -memcpy(pt->pscsi_sense, sense, SCSI_SENSE_BUFFERSIZE); + +pt->pscsi_result = req->errors; +pt->pscsi_resid = req->data_len; -pscsi_process_SAM_status(task, &pt->pscsi_cdb[0], result); +pscsi_process_SAM_status(task, pt); + +__blk_put_request(req->q, req); + return; } - diff --git a/drivers/lio-core/target_core_pscsi.h b/drivers/lio-core/target_core_pscsi.h index 980587d..090f0d2 100644 --- a/drivers/lio-core/target_core_pscsi.h +++ b/drivers/lio-core/target_core_pscsi.h < at >< at > -90,7 +90,7 < at >< at > extern struct scatterlist *pscsi_get_SG (se_task_t *); extern u32 pscsi_get_SG_count (se_task_t *); extern int pscsi_set_non_SG_buf (unsigned char *, se_task_t *); extern void pscsi_shutdown_hba (struct se_hba_s *); -extern void pscsi_req_done (void *, char *, int, int); +extern void pscsi_req_done (struct request *, int); #endif #include <linux/device.h> < at >< at > -104,8 +104,9 < at >< at > typedef struct pscsi_plugin_task_s { unsigned char pscsi_sense[SCSI_SENSE_BUFFERSIZE]; intpscsi_direction; intpscsi_result; -u32pscsi_data_len; +u32pscsi_resid; void*pscsi_buf; +struct request *pscsi_req; } pscsi_plugin_task_t; #define PDF_HAS_CHANNEL_ID0x01 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index f5d3b96..9e03a02 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c < at >< at > -303,8 +303,8 < at >< at > static void scsi_bi_endio(struct bio *bio, int error) * request can be sent to the block layer. We do not trust the scatterlist * sent to use, as some ULDs use that struct to only organize the pages. */ -static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl, - int nsegs, unsigned bufflen, gfp_t gfp) +int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl, + int nsegs, unsigned bufflen, gfp_t gfp) { struct request_queue *q = rq->q; int nr_pages = (bufflen + sgl[0].offset + PAGE_SIZE - 1) >> PAGE_SHIFT; < at >< at > -379,6 +379,8 < at >< at > free_bios: return err; } +EXPORT_SYMBOL_GPL(scsi_req_map_sg); + /** * scsi_execute_async - insert request * < at >sdev:scsi device -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Nicholas A. Bellinger 2008-12-02T01:52:07 http://permalink.gmane.org/gmane.linux.scsi/46427 Hi, I'm trying to port a Windows SCSI API over to Linux. The API has several functions, most of them using ATA_PASS_THROUGH_EX to send a vendor specific command over to the device. I've managed to port 1 of the API function that is a modified INQUIRY command. However, I'm very confused as to how ATA passthrough is done in Linux. I've looked at the sg3_utils source code to get some inspiration but it's too complicated for me to understand what's going on. Does anyone know how to port this? In Windows a ATA_PASS_THROUGH_EX pointer is declared and memory allocated for it. It's fields are then initialized(Length, AtaFlags, DataTransferLength, TimeOutValue, DataBufferOffset, CurrentTaskFile[], PreviousTaskFile[], etc) and then a DeviceIoControl() is called. Now I know Linux's version of DeviceIoControl is ioctl() and I've used it successfully for the INQUIRY command, but what's Linux's version of ATA_PASS_THROUGH_EX? Any help would be appreciated. Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Sihan Goi 2008-12-02T01:50:00 http://permalink.gmane.org/gmane.linux.scsi/46426 Yes this fixed the "w/o REQ_STARTED" error I was seeing on a distro kernel and a mainline system. Thanks, -andmike -- Michael Anderson andmike< at >linux.vnet.ibm.com -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Mike Anderson 2008-12-01T23:45:29 http://permalink.gmane.org/gmane.linux.scsi/46425 From: Harvey Harrison <harvey.harrison< at >gmail.com> It would be easy to get rid of the typedefs too, but I kept this minimal. Noticed by sparse: drivers/scsi/gdth.c:2395:31: warning: incorrect type in assignment (different base types) drivers/scsi/gdth.c:2395:31: expected unsigned int [unsigned] [assigned] [usertype] last_block_no drivers/scsi/gdth.c:2395:31: got restricted __be32 [usertype] <noident> drivers/scsi/gdth.c:2396:27: warning: incorrect type in assignment (different base types) drivers/scsi/gdth.c:2396:27: expected unsigned int [unsigned] [assigned] [usertype] block_length drivers/scsi/gdth.c:2396:27: got restricted __be32 [usertype] <noident> drivers/scsi/gdth.c:2406:33: warning: incorrect type in assignment (different base types) drivers/scsi/gdth.c:2406:33: expected unsigned long long [unsigned] [usertype] last_block_no drivers/scsi/gdth.c:2406:33: got restricted __be64 [usertype] <noident> drivers/scsi/gdth.c:2407:33: warning: incorrect type in assignment (different base types) drivers/scsi/gdth.c:2407:33: expected unsigned int [unsigned] [usertype] block_length drivers/scsi/gdth.c:2407:33: got restricted __be32 [usertype] <noident> Signed-off-by: Harvey Harrison <harvey.harrison< at >gmail.com> Cc: Boaz Harrosh <bharrosh< at >panasas.com> Cc: James Bottomley <James.Bottomley< at >HansenPartnership.com> Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/scsi/gdth.c | 2 +- drivers/scsi/gdth.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/scsi/gdth.c~scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness drivers/scsi/gdth.c --- a/drivers/scsi/gdth.c~scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness +++ a/drivers/scsi/gdth.c < at >< at > -2391,7 +2391,7 < at >< at > static int gdth_internal_cache_cmd(gdth_ case READ_CAPACITY: TRACE2(("Read capacity hdrive %d\n",t)); if (ha->hdr[t].size > (ulong64)0xffffffff) - rdc.last_block_no = 0xffffffff; + rdc.last_block_no = cpu_to_be32(0xffffffff); else rdc.last_block_no = cpu_to_be32(ha->hdr[t].size-1); rdc.block_length = cpu_to_be32(SECTOR_SIZE); diff -puN drivers/scsi/gdth.h~scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness drivers/scsi/gdth.h --- a/drivers/scsi/gdth.h~scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness +++ a/drivers/scsi/gdth.h < at >< at > -968,14 +968,14 < at >< at > typedef struct { /* READ_CAPACITY data format */ typedef struct { - ulong32 last_block_no; - ulong32 block_length; +__be32 last_block_no; +__be32 block_length; } PACKED gdth_rdcap_data; /* READ_CAPACITY (16) data format */ typedef struct { - ulong64 last_block_no; - ulong32 block_length; +__be64 last_block_no; +__be32 block_length; } PACKED gdth_rdcap16_data; /* REQUEST_SENSE data format */ _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:32:14 http://permalink.gmane.org/gmane.linux.scsi/46424 From: Randy Dunlap <randy.dunlap< at >oracle.com> Not critical. WARNING: drivers/char/esp.o(.text+0x278): Section mismatch in reference from the function show_serial_version() to the variable .init.data:serial_version The function show_serial_version() references the variable __initdata serial_version. This is often because show_serial_version lacks a __initdata annotation or the annotation of serial_version is wrong. WARNING: drivers/char/esp.o(.text+0x27d): Section mismatch in reference from the function show_serial_version() to the variable .init.data:serial_name The function show_serial_version() references the variable __initdata serial_name. This is often because show_serial_version lacks a __initdata annotation or the annotation of serial_name is wrong. Signed-off-by: Randy Dunlap <randy.dunlap< at >oracle.com> Cc: Andrew J. Robinson <arobinso< at >nyx.net> Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/char/esp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/char/esp.c~esp-fix-section-mismatch-warning drivers/char/esp.c --- a/drivers/char/esp.c~esp-fix-section-mismatch-warning +++ a/drivers/char/esp.c < at >< at > -2258,7 +2258,7 < at >< at > static int esp_open(struct tty_struct *t * driver. */ -static void show_serial_version(void) +static void __init show_serial_version(void) { printk(KERN_INFO "%s version %s (DMA %u)\n", serial_name, serial_version, dma); _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:32:15 http://permalink.gmane.org/gmane.linux.scsi/46423 From: Harvey Harrison <harvey.harrison< at >gmail.com> Remove two now unnecessary local vars. Signed-off-by: Harvey Harrison <harvey.harrison< at >gmail.com> Cc: Boaz Harrosh <bharrosh< at >panasas.com> Cc: James Bottomley <James.Bottomley< at >HansenPartnership.com> Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/scsi/gdth.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff -puN drivers/scsi/gdth.c~scsi-gdthc-use-unaligned-access-helpers drivers/scsi/gdth.c --- a/drivers/scsi/gdth.c~scsi-gdthc-use-unaligned-access-helpers +++ a/drivers/scsi/gdth.c < at >< at > -131,6 +131,7 < at >< at > #include <asm/system.h> #include <asm/io.h> #include <asm/uaccess.h> +#include <asm/unaligned.h> #include <linux/spinlock.h> #include <linux/blkdev.h> #include <linux/scatterlist.h> < at >< at > -2429,8 +2430,8 < at >< at > static int gdth_fill_cache_cmd(gdth_ha_s { register gdth_cmd_str *cmdp; struct gdth_cmndinfo *cmndinfo = gdth_cmnd_priv(scp); - ulong32 cnt, blockcnt; - ulong64 no, blockno; + ulong32 blockcnt; + ulong64 blockno; int i, cmd_index, read_write, sgcnt, mode64; cmdp = ha->pccb; < at >< at > -2498,19 +2499,15 < at >< at > static int gdth_fill_cache_cmd(gdth_ha_s if (read_write) { if (scp->cmd_len == 16) { - memcpy(&no, &scp->cmnd[2], sizeof(ulong64)); - blockno = be64_to_cpu(no); - memcpy(&cnt, &scp->cmnd[10], sizeof(ulong32)); - blockcnt = be32_to_cpu(cnt); +blockno = get_unaligned_be64(&scp->cmnd[2]); +blockcnt = get_unaligned_be32(&scp->cmnd[10]); } else if (scp->cmd_len == 10) { - memcpy(&no, &scp->cmnd[2], sizeof(ulong32)); - blockno = be32_to_cpu(no); - memcpy(&cnt, &scp->cmnd[7], sizeof(ushort)); - blockcnt = be16_to_cpu(cnt); +blockno = get_unaligned_be32(&scp->cmnd[2]); +blockcnt = get_unaligned_be16(&scp->cmnd[7]); } else { - memcpy(&no, &scp->cmnd[0], sizeof(ulong32)); - blockno = be32_to_cpu(no) & 0x001fffffUL; - blockcnt= scp->cmnd[4]==0 ? 0x100 : scp->cmnd[4]; +blockno = get_unaligned_be32(&scp->cmnd[2]); +blockno &= 0x001fffffUL; +blockcnt = scp->cmnd[4] == 0 ? 0x100 : scp->cmnd[4]; } if (mode64) { cmdp->u.cache64.BlockNo = blockno; _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:32:13 http://permalink.gmane.org/gmane.linux.scsi/46422 From: Martin Michlmayr <tbm< at >cyrius.com> The ACARD driver calls udelay() with a value > 2000, which leads to to the following compilation error on ARM: ERROR: "__bad_udelay" [drivers/scsi/atp870u.ko] undefined! make[1]: *** [__modpost] Error 1 Fix this by using a combination of mdelay and udelay. Signed-off-by: Martin Michlmayr <tbm< at >cyrius.com> Cc: James Bottomley <James.Bottomley< at >HansenPartnership.com> Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/scsi/atp870u.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/scsi/atp870u.c~scsi-fix-bad-use-of-udelay-in-atp870uc drivers/scsi/atp870u.c --- a/drivers/scsi/atp870u.c~scsi-fix-bad-use-of-udelay-in-atp870uc +++ a/drivers/scsi/atp870u.c < at >< at > -1171,7 +1171,8 < at >< at > wait_io1: outw(val, tmport); outb(2, 0x80); TCM_SYNC: -udelay(0x800); +mdelay(2); +udelay(48); if ((inb(tmport) & 0x80) == 0x00) {/* bsy ? */ outw(0, tmport--); outb(0, tmport); _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:32:16 http://permalink.gmane.org/gmane.linux.scsi/46421 From: Harvey Harrison <harvey.harrison< at >gmail.com> Signed-off-by: Harvey Harrison <harvey.harrison< at >gmail.com> Cc: James Bottomley <James.Bottomley< at >HansenPartnership.com> Acked-by: Jeff Garzik <jgarzik< at >redhat.com> Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/scsi/aic7xxx/aic79xx_core.c | 12 +- drivers/scsi/aic7xxx/aic79xx_inline.h | 32 +++---- drivers/scsi/aic7xxx/aic79xx_osm.h | 102 +++++++++++------------ drivers/scsi/aic7xxx/aic79xx_pci.c | 2 drivers/scsi/aic7xxx/aic7xxx_inline.h | 5 - drivers/scsi/aic7xxx/aic7xxx_osm.h | 104 ++++++++++++------------ drivers/scsi/aic7xxx/aic7xxx_pci.c | 2 drivers/scsi/aic7xxx/aiclib.h | 4 drivers/scsi/sym53c8xx_2/sym_glue.h | 6 - drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 drivers/scsi/sym53c8xx_2/sym_hipd.h | 6 - drivers/scsi/sym53c8xx_2/sym_malloc.c | 2 drivers/scsi/sym53c8xx_2/sym_misc.h | 18 ++-- 13 files changed, 146 insertions(+), 151 deletions(-) diff -puN drivers/scsi/aic7xxx/aic79xx_core.c~scsi-replace-__inline-with-inline drivers/scsi/aic7xxx/aic79xx_core.c --- a/drivers/scsi/aic7xxx/aic79xx_core.c~scsi-replace-__inline-with-inline +++ a/drivers/scsi/aic7xxx/aic79xx_core.c < at >< at > -1034,7 +1034,7 < at >< at > ahd_intr(struct ahd_softc *ahd) } /******************************** Private Inlines *****************************/ -static __inline void +static inline void ahd_assert_atn(struct ahd_softc *ahd) { ahd_outb(ahd, SCSISIGO, ATNO); < at >< at > -1069,7 +1069,7 < at >< at > ahd_currently_packetized(struct ahd_soft return (packetized); } -static __inline int +static inline int ahd_set_active_fifo(struct ahd_softc *ahd) { u_int active_fifo; < at >< at > -1086,7 +1086,7 < at >< at > ahd_set_active_fifo(struct ahd_softc *ah } } -static __inline void +static inline void ahd_unbusy_tcl(struct ahd_softc *ahd, u_int tcl) { ahd_busy_tcl(ahd, tcl, SCB_LIST_NULL); < at >< at > -1096,7 +1096,7 < at >< at > ahd_unbusy_tcl(struct ahd_softc *ahd, u_ * Determine whether the sequencer reported a residual * for this SCB/transaction. */ -static __inline void +static inline void ahd_update_residual(struct ahd_softc *ahd, struct scb *scb) { uint32_t sgptr; < at >< at > -1106,7 +1106,7 < at >< at > ahd_update_residual(struct ahd_softc *ah ahd_calc_residual(ahd, scb); } -static __inline void +static inline void ahd_complete_scb(struct ahd_softc *ahd, struct scb *scb) { uint32_t sgptr; < at >< at > -7987,7 +7987,7 < at >< at > ahd_resume(struct ahd_softc *ahd) * scbid that should be restored once manipualtion * of the TCL entry is complete. */ -static __inline u_int +static inline u_int ahd_index_busy_tcl(struct ahd_softc *ahd, u_int *saved_scbid, u_int tcl) { /* diff -puN drivers/scsi/aic7xxx/aic79xx_inline.h~scsi-replace-__inline-with-inline drivers/scsi/aic7xxx/aic79xx_inline.h --- a/drivers/scsi/aic7xxx/aic79xx_inline.h~scsi-replace-__inline-with-inline +++ a/drivers/scsi/aic7xxx/aic79xx_inline.h < at >< at > -46,21 +46,20 < at >< at > #define _AIC79XX_INLINE_H_ /******************************** Debugging ***********************************/ -static __inline char *ahd_name(struct ahd_softc *ahd); +static inline char *ahd_name(struct ahd_softc *ahd); -static __inline char * -ahd_name(struct ahd_softc *ahd) +static inline char *ahd_name(struct ahd_softc *ahd) { return (ahd->name); } /************************ Sequencer Execution Control *************************/ -static __inline void ahd_known_modes(struct ahd_softc *ahd, +static inline void ahd_known_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst); -static __inline ahd_mode_state ahd_build_mode_state(struct ahd_softc *ahd, +static inline ahd_mode_state ahd_build_mode_state(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst); -static __inline void ahd_extract_mode_state(struct ahd_softc *ahd, +static inline void ahd_extract_mode_state(struct ahd_softc *ahd, ahd_mode_state state, ahd_mode *src, ahd_mode *dst); < at >< at > -73,7 +72,7 < at >< at > int ahd_is_paused(struct ahd_softc *ahd void ahd_pause(struct ahd_softc *ahd); void ahd_unpause(struct ahd_softc *ahd); -static __inline void +static inline void ahd_known_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst) { ahd->src_mode = src; < at >< at > -82,13 +81,13 < at >< at > ahd_known_modes(struct ahd_softc *ahd, a ahd->saved_dst_mode = dst; } -static __inline ahd_mode_state +static inline ahd_mode_state ahd_build_mode_state(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst) { return ((src << SRC_MODE_SHIFT) | (dst << DST_MODE_SHIFT)); } -static __inline void +static inline void ahd_extract_mode_state(struct ahd_softc *ahd, ahd_mode_state state, ahd_mode *src, ahd_mode *dst) { < at >< at > -102,13 +101,12 < at >< at > void*ahd_sg_setup(struct ahd_softc *ahd bus_size_t len, int last); /************************** Memory mapping routines ***************************/ -static __inline size_tahd_sg_size(struct ahd_softc *ahd); +static inline size_tahd_sg_size(struct ahd_softc *ahd); voidahd_sync_sglist(struct ahd_softc *ahd, struct scb *scb, int op); -static __inline size_t -ahd_sg_size(struct ahd_softc *ahd) +static inline size_t ahd_sg_size(struct ahd_softc *ahd) { if ((ahd->flags & AHD_64BIT_ADDRESSING) != 0) return (sizeof(struct ahd_dma64_seg)); < at >< at > -141,11 +139,9 < at >< at > struct scb * ahd_lookup_scb(struct ahd_softc *ahd, u_int tag); voidahd_queue_scb(struct ahd_softc *ahd, struct scb *scb); -static __inline uint8_t * -ahd_get_sense_buf(struct ahd_softc *ahd, +static inline uint8_t *ahd_get_sense_buf(struct ahd_softc *ahd, struct scb *scb); -static __inline uint32_t -ahd_get_sense_bufaddr(struct ahd_softc *ahd, +static inline uint32_t ahd_get_sense_bufaddr(struct ahd_softc *ahd, struct scb *scb); #if 0 /* unused */ < at >< at > -158,13 +154,13 < at >< at > do {\ #endif -static __inline uint8_t * +static inline uint8_t * ahd_get_sense_buf(struct ahd_softc *ahd, struct scb *scb) { return (scb->sense_data); } -static __inline uint32_t +static inline uint32_t ahd_get_sense_bufaddr(struct ahd_softc *ahd, struct scb *scb) { return (scb->sense_busaddr); diff -puN drivers/scsi/aic7xxx/aic79xx_osm.h~scsi-replace-__inline-with-inline drivers/scsi/aic7xxx/aic79xx_osm.h --- a/drivers/scsi/aic7xxx/aic79xx_osm.h~scsi-replace-__inline-with-inline +++ a/drivers/scsi/aic7xxx/aic79xx_osm.h < at >< at > -395,19 +395,19 < at >< at > struct info_str { }; /******************************** Locking *************************************/ -static __inline void +static inline void ahd_lockinit(struct ahd_softc *ahd) { spin_lock_init(&ahd->platform_data->spin_lock); } -static __inline void +static inline void ahd_lock(struct ahd_softc *ahd, unsigned long *flags) { spin_lock_irqsave(&ahd->platform_data->spin_lock, *flags); } -static __inline void +static inline void ahd_unlock(struct ahd_softc *ahd, unsigned long *flags) { spin_unlock_irqrestore(&ahd->platform_data->spin_lock, *flags); < at >< at > -490,29 +490,29 < at >< at > void ahd_pci_write_config(ahd_dev_sof int reg, uint32_t value, int width); -static __inline int ahd_get_pci_function(ahd_dev_softc_t); -static __inline int +static inline int ahd_get_pci_function(ahd_dev_softc_t); +static inline int ahd_get_pci_function(ahd_dev_softc_t pci) { return (PCI_FUNC(pci->devfn)); } -static __inline int ahd_get_pci_slot(ahd_dev_softc_t); -static __inline int +static inline int ahd_get_pci_slot(ahd_dev_softc_t); +static inline int ahd_get_pci_slot(ahd_dev_softc_t pci) { return (PCI_SLOT(pci->devfn)); } -static __inline int ahd_get_pci_bus(ahd_dev_softc_t); -static __inline int +static inline int ahd_get_pci_bus(ahd_dev_softc_t); +static inline int ahd_get_pci_bus(ahd_dev_softc_t pci) { return (pci->bus->number); } -static __inline void ahd_flush_device_writes(struct ahd_softc *); -static __inline void +static inline void ahd_flush_device_writes(struct ahd_softc *); +static inline void ahd_flush_device_writes(struct ahd_softc *ahd) { /* XXX Is this sufficient for all architectures??? */ < at >< at > -524,81 +524,81 < at >< at > intahd_linux_proc_info(struct Scsi_Host off_t, int, int); /*********************** Transaction Access Wrappers **************************/ -static __inline void ahd_cmd_set_transaction_status(struct scsi_cmnd *, uint32_t); -static __inline void ahd_set_transaction_status(struct scb *, uint32_t); -static __inline void ahd_cmd_set_scsi_status(struct scsi_cmnd *, uint32_t); -static __inline void ahd_set_scsi_status(struct scb *, uint32_t); -static __inline uint32_t ahd_cmd_get_transaction_status(struct scsi_cmnd *cmd); -static __inline uint32_t ahd_get_transaction_status(struct scb *); -static __inline uint32_t ahd_cmd_get_scsi_status(struct scsi_cmnd *cmd); -static __inline uint32_t ahd_get_scsi_status(struct scb *); -static __inline void ahd_set_transaction_tag(struct scb *, int, u_int); -static __inline u_long ahd_get_transfer_length(struct scb *); -static __inline int ahd_get_transfer_dir(struct scb *); -static __inline void ahd_set_residual(struct scb *, u_long); -static __inline void ahd_set_sense_residual(struct scb *scb, u_long resid); -static __inline u_long ahd_get_residual(struct scb *); -static __inline u_long ahd_get_sense_residual(struct scb *); -static __inline int ahd_perform_autosense(struct scb *); -static __inline uint32_t ahd_get_sense_bufsize(struct ahd_softc *, +static inline void ahd_cmd_set_transaction_status(struct scsi_cmnd *, uint32_t); +static inline void ahd_set_transaction_status(struct scb *, uint32_t); +static inline void ahd_cmd_set_scsi_status(struct scsi_cmnd *, uint32_t); +static inline void ahd_set_scsi_status(struct scb *, uint32_t); +static inline uint32_t ahd_cmd_get_transaction_status(struct scsi_cmnd *cmd); +static inline uint32_t ahd_get_transaction_status(struct scb *); +static inline uint32_t ahd_cmd_get_scsi_status(struct scsi_cmnd *cmd); +static inline uint32_t ahd_get_scsi_status(struct scb *); +static inline void ahd_set_transaction_tag(struct scb *, int, u_int); +static inline u_long ahd_get_transfer_length(struct scb *); +static inline int ahd_get_transfer_dir(struct scb *); +static inline void ahd_set_residual(struct scb *, u_long); +static inline void ahd_set_sense_residual(struct scb *scb, u_long resid); +static inline u_long ahd_get_residual(struct scb *); +static inline u_long ahd_get_sense_residual(struct scb *); +static inline int ahd_perform_autosense(struct scb *); +static inline uint32_t ahd_get_sense_bufsize(struct ahd_softc *, struct scb *); -static __inline void ahd_notify_xfer_settings_change(struct ahd_softc *, +static inline void ahd_notify_xfer_settings_change(struct ahd_softc *, struct ahd_devinfo *); -static __inline void ahd_platform_scb_free(struct ahd_softc *ahd, +static inline void ahd_platform_scb_free(struct ahd_softc *ahd, struct scb *scb); -static __inline void ahd_freeze_scb(struct scb *scb); +static inline void ahd_freeze_scb(struct scb *scb); -static __inline +static inline void ahd_cmd_set_transaction_status(struct scsi_cmnd *cmd, uint32_t status) { cmd->result &= ~(CAM_STATUS_MASK << 16); cmd->result |= status << 16; } -static __inline +static inline void ahd_set_transaction_status(struct scb *scb, uint32_t status) { ahd_cmd_set_transaction_status(scb->io_ctx,status); } -static __inline +static inline void ahd_cmd_set_scsi_status(struct scsi_cmnd *cmd, uint32_t status) { cmd->result &= ~0xFFFF; cmd->result |= status; } -static __inline +static inline void ahd_set_scsi_status(struct scb *scb, uint32_t status) { ahd_cmd_set_scsi_status(scb->io_ctx, status); } -static __inline +static inline uint32_t ahd_cmd_get_transaction_status(struct scsi_cmnd *cmd) { return ((cmd->result >> 16) & CAM_STATUS_MASK); } -static __inline +static inline uint32_t ahd_get_transaction_status(struct scb *scb) { return (ahd_cmd_get_transaction_status(scb->io_ctx)); } -static __inline +static inline uint32_t ahd_cmd_get_scsi_status(struct scsi_cmnd *cmd) { return (cmd->result & 0xFFFF); } -static __inline +static inline uint32_t ahd_get_scsi_status(struct scb *scb) { return (ahd_cmd_get_scsi_status(scb->io_ctx)); } -static __inline +static inline void ahd_set_transaction_tag(struct scb *scb, int enabled, u_int type) { /* < at >< at > -607,43 +607,43 < at >< at > void ahd_set_transaction_tag(struct scb */ } -static __inline +static inline u_long ahd_get_transfer_length(struct scb *scb) { return (scb->platform_data->xfer_len); } -static __inline +static inline int ahd_get_transfer_dir(struct scb *scb) { return (scb->io_ctx->sc_data_direction); } -static __inline +static inline void ahd_set_residual(struct scb *scb, u_long resid) { scsi_set_resid(scb->io_ctx, resid); } -static __inline +static inline void ahd_set_sense_residual(struct scb *scb, u_long resid) { scb->platform_data->sense_resid = resid; } -static __inline +static inline u_long ahd_get_residual(struct scb *scb) { return scsi_get_resid(scb->io_ctx); } -static __inline +static inline u_long ahd_get_sense_residual(struct scb *scb) { return (scb->platform_data->sense_resid); } -static __inline +static inline int ahd_perform_autosense(struct scb *scb) { /* < at >< at > -654,20 +654,20 < at >< at > int ahd_perform_autosense(struct scb *sc return (1); } -static __inline uint32_t +static inline uint32_t ahd_get_sense_bufsize(struct ahd_softc *ahd, struct scb *scb) { return (sizeof(struct scsi_sense_data)); } -static __inline void +static inline void ahd_notify_xfer_settings_change(struct ahd_softc *ahd, struct ahd_devinfo *devinfo) { /* Nothing to do here for linux */ } -static __inline void +static inline void ahd_platform_scb_free(struct ahd_softc *ahd, struct scb *scb) { ahd->flags &= ~AHD_RESOURCE_SHORTAGE; < at >< at > -678,7 +678,7 < at >< at > voidahd_platform_free(struct ahd_softc voidahd_platform_init(struct ahd_softc *ahd); voidahd_platform_freeze_devq(struct ahd_softc *ahd, struct scb *scb); -static __inline void +static inline void ahd_freeze_scb(struct scb *scb) { if ((scb->io_ctx->result & (CAM_DEV_QFRZN << 16)) == 0) { diff -puN drivers/scsi/aic7xxx/aic79xx_pci.c~scsi-replace-__inline-with-inline drivers/scsi/aic7xxx/aic79xx_pci.c --- a/drivers/scsi/aic7xxx/aic79xx_pci.c~scsi-replace-__inline-with-inline +++ a/drivers/scsi/aic7xxx/aic79xx_pci.c < at >< at > -51,7 +51,7 < at >< at > #include "aic79xx_pci.h" -static __inline uint64_t +static inline uint64_t ahd_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor) { uint64_t id; diff -puN drivers/scsi/aic7xxx/aic7xxx_inline.h~scsi-replace-__inline-with-inline drivers/scsi/aic7xxx/aic7xxx_inline.h --- a/drivers/scsi/aic7xxx/aic7xxx_inline.h~scsi-replace-__inline-with-inline +++ a/drivers/scsi/aic7xxx/aic7xxx_inline.h < at >< at > -55,10 +55,9 < at >< at > voidahc_sync_sglist(struct ahc_softc *a struct scb *scb, int op); /******************************** Debugging ***********************************/ -static __inline char *ahc_name(struct ahc_softc *ahc); +static inline char *ahc_name(struct ahc_softc *ahc); -static __inline char * -ahc_name(struct ahc_softc *ahc) +static inline char *ahc_name(struct ahc_softc *ahc) { return (ahc->name); } diff -puN drivers/scsi/aic7xxx/aic7xxx_osm.h~scsi-replace-__inline-with-inline drivers/scsi/aic7xxx/aic7xxx_osm.h --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h~scsi-replace-__inline-with-inline +++ a/drivers/scsi/aic7xxx/aic7xxx_osm.h < at >< at > -230,7 +230,7 < at >< at > intahc_dmamap_unload(struct ahc_softc * #include "aic7xxx.h" /***************************** Timer Facilities *******************************/ -static __inline void +static inline void ahc_scb_timer_reset(struct scb *scb, u_int usec) { } < at >< at > -401,19 +401,19 < at >< at > struct info_str { /******************************** Locking *************************************/ /* Lock protecting internal data structures */ -static __inline void +static inline void ahc_lockinit(struct ahc_softc *ahc) { spin_lock_init(&ahc->platform_data->spin_lock); } -static __inline void +static inline void ahc_lock(struct ahc_softc *ahc, unsigned long *flags) { spin_lock_irqsave(&ahc->platform_data->spin_lock, *flags); } -static __inline void +static inline void ahc_unlock(struct ahc_softc *ahc, unsigned long *flags) { spin_unlock_irqrestore(&ahc->platform_data->spin_lock, *flags); < at >< at > -493,22 +493,22 < at >< at > void ahc_pci_write_config(ahc_dev_sof int reg, uint32_t value, int width); -static __inline int ahc_get_pci_function(ahc_dev_softc_t); -static __inline int +static inline int ahc_get_pci_function(ahc_dev_softc_t); +static inline int ahc_get_pci_function(ahc_dev_softc_t pci) { return (PCI_FUNC(pci->devfn)); } -static __inline int ahc_get_pci_slot(ahc_dev_softc_t); -static __inline int +static inline int ahc_get_pci_slot(ahc_dev_softc_t); +static inline int ahc_get_pci_slot(ahc_dev_softc_t pci) { return (PCI_SLOT(pci->devfn)); } -static __inline int ahc_get_pci_bus(ahc_dev_softc_t); -static __inline int +static inline int ahc_get_pci_bus(ahc_dev_softc_t); +static inline int ahc_get_pci_bus(ahc_dev_softc_t pci) { return (pci->bus->number); < at >< at > -521,8 +521,8 < at >< at > static inline void ahc_linux_pci_exit(vo } #endif -static __inline void ahc_flush_device_writes(struct ahc_softc *); -static __inline void +static inline void ahc_flush_device_writes(struct ahc_softc *); +static inline void ahc_flush_device_writes(struct ahc_softc *ahc) { /* XXX Is this sufficient for all architectures??? */ < at >< at > -535,81 +535,81 < at >< at > intahc_linux_proc_info(struct Scsi_Host /*************************** Domain Validation ********************************/ /*********************** Transaction Access Wrappers *************************/ -static __inline void ahc_cmd_set_transaction_status(struct scsi_cmnd *, uint32_t); -static __inline void ahc_set_transaction_status(struct scb *, uint32_t); -static __inline void ahc_cmd_set_scsi_status(struct scsi_cmnd *, uint32_t); -static __inline void ahc_set_scsi_status(struct scb *, uint32_t); -static __inline uint32_t ahc_cmd_get_transaction_status(struct scsi_cmnd *cmd); -static __inline uint32_t ahc_get_transaction_status(struct scb *); -static __inline uint32_t ahc_cmd_get_scsi_status(struct scsi_cmnd *cmd); -static __inline uint32_t ahc_get_scsi_status(struct scb *); -static __inline void ahc_set_transaction_tag(struct scb *, int, u_int); -static __inline u_long ahc_get_transfer_length(struct scb *); -static __inline int ahc_get_transfer_dir(struct scb *); -static __inline void ahc_set_residual(struct scb *, u_long); -static __inline void ahc_set_sense_residual(struct scb *scb, u_long resid); -static __inline u_long ahc_get_residual(struct scb *); -static __inline u_long ahc_get_sense_residual(struct scb *); -static __inline int ahc_perform_autosense(struct scb *); -static __inline uint32_t ahc_get_sense_bufsize(struct ahc_softc *, +static inline void ahc_cmd_set_transaction_status(struct scsi_cmnd *, uint32_t); +static inline void ahc_set_transaction_status(struct scb *, uint32_t); +static inline void ahc_cmd_set_scsi_status(struct scsi_cmnd *, uint32_t); +static inline void ahc_set_scsi_status(struct scb *, uint32_t); +static inline uint32_t ahc_cmd_get_transaction_status(struct scsi_cmnd *cmd); +static inline uint32_t ahc_get_transaction_status(struct scb *); +static inline uint32_t ahc_cmd_get_scsi_status(struct scsi_cmnd *cmd); +static inline uint32_t ahc_get_scsi_status(struct scb *); +static inline void ahc_set_transaction_tag(struct scb *, int, u_int); +static inline u_long ahc_get_transfer_length(struct scb *); +static inline int ahc_get_transfer_dir(struct scb *); +static inline void ahc_set_residual(struct scb *, u_long); +static inline void ahc_set_sense_residual(struct scb *scb, u_long resid); +static inline u_long ahc_get_residual(struct scb *); +static inline u_long ahc_get_sense_residual(struct scb *); +static inline int ahc_perform_autosense(struct scb *); +static inline uint32_t ahc_get_sense_bufsize(struct ahc_softc *, struct scb *); -static __inline void ahc_notify_xfer_settings_change(struct ahc_softc *, +static inline void ahc_notify_xfer_settings_change(struct ahc_softc *, struct ahc_devinfo *); -static __inline void ahc_platform_scb_free(struct ahc_softc *ahc, +static inline void ahc_platform_scb_free(struct ahc_softc *ahc, struct scb *scb); -static __inline void ahc_freeze_scb(struct scb *scb); +static inline void ahc_freeze_scb(struct scb *scb); -static __inline +static inline void ahc_cmd_set_transaction_status(struct scsi_cmnd *cmd, uint32_t status) { cmd->result &= ~(CAM_STATUS_MASK << 16); cmd->result |= status << 16; } -static __inline +static inline void ahc_set_transaction_status(struct scb *scb, uint32_t status) { ahc_cmd_set_transaction_status(scb->io_ctx,status); } -static __inline +static inline void ahc_cmd_set_scsi_status(struct scsi_cmnd *cmd, uint32_t status) { cmd->result &= ~0xFFFF; cmd->result |= status; } -static __inline +static inline void ahc_set_scsi_status(struct scb *scb, uint32_t status) { ahc_cmd_set_scsi_status(scb->io_ctx, status); } -static __inline +static inline uint32_t ahc_cmd_get_transaction_status(struct scsi_cmnd *cmd) { return ((cmd->result >> 16) & CAM_STATUS_MASK); } -static __inline +static inline uint32_t ahc_get_transaction_status(struct scb *scb) { return (ahc_cmd_get_transaction_status(scb->io_ctx)); } -static __inline +static inline uint32_t ahc_cmd_get_scsi_status(struct scsi_cmnd *cmd) { return (cmd->result & 0xFFFF); } -static __inline +static inline uint32_t ahc_get_scsi_status(struct scb *scb) { return (ahc_cmd_get_scsi_status(scb->io_ctx)); } -static __inline +static inline void ahc_set_transaction_tag(struct scb *scb, int enabled, u_int type) { /* < at >< at > -618,43 +618,43 < at >< at > void ahc_set_transaction_tag(struct scb */ } -static __inline +static inline u_long ahc_get_transfer_length(struct scb *scb) { return (scb->platform_data->xfer_len); } -static __inline +static inline int ahc_get_transfer_dir(struct scb *scb) { return (scb->io_ctx->sc_data_direction); } -static __inline +static inline void ahc_set_residual(struct scb *scb, u_long resid) { scsi_set_resid(scb->io_ctx, resid); } -static __inline +static inline void ahc_set_sense_residual(struct scb *scb, u_long resid) { scb->platform_data->sense_resid = resid; } -static __inline +static inline u_long ahc_get_residual(struct scb *scb) { return scsi_get_resid(scb->io_ctx); } -static __inline +static inline u_long ahc_get_sense_residual(struct scb *scb) { return (scb->platform_data->sense_resid); } -static __inline +static inline int ahc_perform_autosense(struct scb *scb) { /* < at >< at > -665,20 +665,20 < at >< at > int ahc_perform_autosense(struct scb *sc return (1); } -static __inline uint32_t +static inline uint32_t ahc_get_sense_bufsize(struct ahc_softc *ahc, struct scb *scb) { return (sizeof(struct scsi_sense_data)); } -static __inline void +static inline void ahc_notify_xfer_settings_change(struct ahc_softc *ahc, struct ahc_devinfo *devinfo) { /* Nothing to do here for linux */ } -static __inline void +static inline void ahc_platform_scb_free(struct ahc_softc *ahc, struct scb *scb) { } < at >< at > -687,7 +687,7 < at >< at > intahc_platform_alloc(struct ahc_softc voidahc_platform_free(struct ahc_softc *ahc); voidahc_platform_freeze_devq(struct ahc_softc *ahc, struct scb *scb); -static __inline void +static inline void ahc_freeze_scb(struct scb *scb) { if ((scb->io_ctx->result & (CAM_DEV_QFRZN << 16)) == 0) { diff -puN drivers/scsi/aic7xxx/aic7xxx_pci.c~scsi-replace-__inline-with-inline drivers/scsi/aic7xxx/aic7xxx_pci.c --- a/drivers/scsi/aic7xxx/aic7xxx_pci.c~scsi-replace-__inline-with-inline +++ a/drivers/scsi/aic7xxx/aic7xxx_pci.c < at >< at > -54,7 +54,7 < at >< at > #include "aic7xxx_pci.h" -static __inline uint64_t +static inline uint64_t ahc_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor) { uint64_t id; diff -puN drivers/scsi/aic7xxx/aiclib.h~scsi-replace-__inline-with-inline drivers/scsi/aic7xxx/aiclib.h --- a/drivers/scsi/aic7xxx/aiclib.h~scsi-replace-__inline-with-inline +++ a/drivers/scsi/aic7xxx/aiclib.h < at >< at > -133,7 +133,7 < at >< at > struct scsi_sense_data #define SCSI_STATUS_TASK_ABORTED0x40 /************************* Large Disk Handling ********************************/ -static __inline int +static inline int aic_sector_div(sector_t capacity, int heads, int sectors) { /* ugly, ugly sector_div calling convention.. */ < at >< at > -141,7 +141,7 < at >< at > aic_sector_div(sector_t capacity, int he return (int)capacity; } -static __inline uint32_t +static inline uint32_t scsi_4btoul(uint8_t *bytes) { uint32_t rv; diff -puN drivers/scsi/sym53c8xx_2/sym_glue.h~scsi-replace-__inline-with-inline drivers/scsi/sym53c8xx_2/sym_glue.h --- a/drivers/scsi/sym53c8xx_2/sym_glue.h~scsi-replace-__inline-with-inline +++ a/drivers/scsi/sym53c8xx_2/sym_glue.h < at >< at > -234,7 +234,7 < at >< at > static inline struct sym_hcb * sym_get_h /* * Set the status field of a CAM CCB. */ -static __inline void +static inline void sym_set_cam_status(struct scsi_cmnd *cmd, int status) { cmd->result &= ~(0xff << 16); < at >< at > -244,7 +244,7 < at >< at > sym_set_cam_status(struct scsi_cmnd *cmd /* * Get the status field of a CAM CCB. */ -static __inline int +static inline int sym_get_cam_status(struct scsi_cmnd *cmd) { return host_byte(cmd->result); < at >< at > -253,7 +253,7 < at >< at > sym_get_cam_status(struct scsi_cmnd *cmd /* * Build CAM result for a successful IO and for a failed IO. */ -static __inline void sym_set_cam_result_ok(struct sym_ccb *cp, struct scsi_cmnd *cmd, int resid) +static inline void sym_set_cam_result_ok(struct sym_ccb *cp, struct scsi_cmnd *cmd, int resid) { scsi_set_resid(cmd, resid); cmd->result = (((DID_OK) << 16) + ((cp->ssss_status) & 0x7f)); diff -puN drivers/scsi/sym53c8xx_2/sym_hipd.c~scsi-replace-__inline-with-inline drivers/scsi/sym53c8xx_2/sym_hipd.c --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c~scsi-replace-__inline-with-inline +++ a/drivers/scsi/sym53c8xx_2/sym_hipd.c < at >< at > -602,7 +602,7 < at >< at > sym_getsync(struct sym_hcb *np, u_char d /* * Set initial io register bits from burst code. */ -static __inline void sym_init_burst(struct sym_hcb *np, u_char bc) +static inline void sym_init_burst(struct sym_hcb *np, u_char bc) { np->rv_ctest4&= ~0x80; np->rv_dmode&= ~(0x3 << 6); diff -puN drivers/scsi/sym53c8xx_2/sym_hipd.h~scsi-replace-__inline-with-inline drivers/scsi/sym53c8xx_2/sym_hipd.h --- a/drivers/scsi/sym53c8xx_2/sym_hipd.h~scsi-replace-__inline-with-inline +++ a/drivers/scsi/sym53c8xx_2/sym_hipd.h < at >< at > -1092,7 +1092,7 < at >< at > do {\ #elif SYM_CONF_DMA_ADDRESSING_MODE == 2 #define DMA_DAC_MASKDMA_64BIT_MASK int sym_lookup_dmap(struct sym_hcb *np, u32 h, int s); -static __inline void +static inline void sym_build_sge(struct sym_hcb *np, struct sym_tblmove *data, u64 badd, int len) { u32 h = (badd>>32); < at >< at > -1197,7 +1197,7 < at >< at > dma_addr_t __vtobus(m_pool_ident_t dev_d #define sym_m_pool_match(mp_id1, mp_id2)(mp_id1 == mp_id2) -static __inline void *sym_m_get_dma_mem_cluster(m_pool_p mp, m_vtob_p vbp) +static inline void *sym_m_get_dma_mem_cluster(m_pool_p mp, m_vtob_p vbp) { void *vaddr = NULL; dma_addr_t baddr = 0; < at >< at > -1211,7 +1211,7 < at >< at > static __inline void *sym_m_get_dma_mem_ return vaddr; } -static __inline void sym_m_free_dma_mem_cluster(m_pool_p mp, m_vtob_p vbp) +static inline void sym_m_free_dma_mem_cluster(m_pool_p mp, m_vtob_p vbp) { dma_free_coherent(mp->dev_dmat, SYM_MEM_CLUSTER_SIZE, vbp->vaddr, vbp->baddr); diff -puN drivers/scsi/sym53c8xx_2/sym_malloc.c~scsi-replace-__inline-with-inline drivers/scsi/sym53c8xx_2/sym_malloc.c --- a/drivers/scsi/sym53c8xx_2/sym_malloc.c~scsi-replace-__inline-with-inline +++ a/drivers/scsi/sym53c8xx_2/sym_malloc.c < at >< at > -262,7 +262,7 < at >< at > static void ___free_dma_mem_cluster(m_po #endif /* Fetch the memory pool for a given pool id (i.e. DMA constraints) */ -static __inline m_pool_p ___get_dma_pool(m_pool_ident_t dev_dmat) +static inline m_pool_p ___get_dma_pool(m_pool_ident_t dev_dmat) { m_pool_p mp; for (mp = mp0.next; diff -puN drivers/scsi/sym53c8xx_2/sym_misc.h~scsi-replace-__inline-with-inline drivers/scsi/sym53c8xx_2/sym_misc.h --- a/drivers/scsi/sym53c8xx_2/sym_misc.h~scsi-replace-__inline-with-inline +++ a/drivers/scsi/sym53c8xx_2/sym_misc.h < at >< at > -52,17 +52,17 < at >< at > typedef struct sym_quehead { (ptr)->flink = (ptr); (ptr)->blink = (ptr); \ } while (0) -static __inline struct sym_quehead *sym_que_first(struct sym_quehead *head) +static inline struct sym_quehead *sym_que_first(struct sym_quehead *head) { return (head->flink == head) ? 0 : head->flink; } -static __inline struct sym_quehead *sym_que_last(struct sym_quehead *head) +static inline struct sym_quehead *sym_que_last(struct sym_quehead *head) { return (head->blink == head) ? 0 : head->blink; } -static __inline void __sym_que_add(struct sym_quehead * new, +static inline void __sym_que_add(struct sym_quehead * new, struct sym_quehead * blink, struct sym_quehead * flink) { < at >< at > -72,19 +72,19 < at >< at > static __inline void __sym_que_add(struc blink->flink= new; } -static __inline void __sym_que_del(struct sym_quehead * blink, +static inline void __sym_que_del(struct sym_quehead * blink, struct sym_quehead * flink) { flink->blink = blink; blink->flink = flink; } -static __inline int sym_que_empty(struct sym_quehead *head) +static inline int sym_que_empty(struct sym_quehead *head) { return head->flink == head; } -static __inline void sym_que_splice(struct sym_quehead *list, +static inline void sym_que_splice(struct sym_quehead *list, struct sym_quehead *head) { struct sym_quehead *first = list->flink; < at >< at > -101,7 +101,7 < at >< at > static __inline void sym_que_splice(stru } } -static __inline void sym_que_move(struct sym_quehead *orig, +static inline void sym_que_move(struct sym_quehead *orig, struct sym_quehead *dest) { struct sym_quehead *first, *last; < at >< at > -129,7 +129,7 < at >< at > static __inline void sym_que_move(struct #define sym_insque_head(new, head)__sym_que_add(new, head, (head)->flink) -static __inline struct sym_quehead *sym_remque_head(struct sym_quehead *head) +static inline struct sym_quehead *sym_remque_head(struct sym_quehead *head) { struct sym_quehead *elem = head->flink; < at >< at > -142,7 +142,7 < at >< at > static __inline struct sym_quehead *sym_ #define sym_insque_tail(new, head)__sym_que_add(new, (head)->blink, head) -static __inline struct sym_quehead *sym_remque_tail(struct sym_quehead *head) +static inline struct sym_quehead *sym_remque_tail(struct sym_quehead *head) { struct sym_quehead *elem = head->blink; _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:32:09 http://permalink.gmane.org/gmane.linux.scsi/46420 From: Adrian Bunk <bunk< at >kernel.org> a3000_{detect,release}() can become static. Signed-off-by: Adrian Bunk <bunk< at >kernel.org> Cc: James Bottomley <James.Bottomley< at >HansenPartnership.com> Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/scsi/a3000.c | 6 ++++-- drivers/scsi/a3000.h | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff -puN drivers/scsi/a3000.c~drivers-scsi-a3000c-make-2-functions-static drivers/scsi/a3000.c --- a/drivers/scsi/a3000.c~drivers-scsi-a3000c-make-2-functions-static +++ a/drivers/scsi/a3000.c < at >< at > -25,6 +25,8 < at >< at > static struct Scsi_Host *a3000_host = NULL; +static int a3000_release(struct Scsi_Host *instance); + static irqreturn_t a3000_intr (int irq, void *dummy) { unsigned long flags; < at >< at > -157,7 +159,7 < at >< at > static void dma_stop(struct Scsi_Host *i } } -int __init a3000_detect(struct scsi_host_template *tpnt) +static int __init a3000_detect(struct scsi_host_template *tpnt) { wd33c93_regs regs; < at >< at > -232,7 +234,7 < at >< at > static struct scsi_host_template driver_ #include "scsi_module.c" -int a3000_release(struct Scsi_Host *instance) +static int a3000_release(struct Scsi_Host *instance) { wd33c93_release(); DMA(instance)->CNTR = 0; diff -puN drivers/scsi/a3000.h~drivers-scsi-a3000c-make-2-functions-static drivers/scsi/a3000.h --- a/drivers/scsi/a3000.h~drivers-scsi-a3000c-make-2-functions-static +++ a/drivers/scsi/a3000.h < at >< at > -11,9 +11,6 < at >< at > #include <linux/types.h> -int a3000_detect(struct scsi_host_template *); -int a3000_release(struct Scsi_Host *); - #ifndef CMD_PER_LUN #define CMD_PER_LUN 2 #endif _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:32:12 http://permalink.gmane.org/gmane.linux.scsi/46419 From: Adrian Bunk <bunk< at >kernel.org> a2091_{detect,release}() can become static. Signed-off-by: Adrian Bunk <bunk< at >kernel.org> Cc: James Bottomley <James.Bottomley< at >HansenPartnership.com> Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/scsi/a2091.c | 6 ++++-- drivers/scsi/a2091.h | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff -puN drivers/scsi/a2091.c~drivers-scsi-a2091c-make-2-functions-static drivers/scsi/a2091.c --- a/drivers/scsi/a2091.c~drivers-scsi-a2091c-make-2-functions-static +++ a/drivers/scsi/a2091.c < at >< at > -23,6 +23,8 < at >< at > #define DMA(ptr) ((a2091_scsiregs *)((ptr)->base)) #define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata)) +static int a2091_release(struct Scsi_Host *instance); + static irqreturn_t a2091_intr (int irq, void *_instance) { unsigned long flags; < at >< at > -144,7 +146,7 < at >< at > static void dma_stop(struct Scsi_Host *i } } -int __init a2091_detect(struct scsi_host_template *tpnt) +static int __init a2091_detect(struct scsi_host_template *tpnt) { static unsigned char called = 0; struct Scsi_Host *instance; < at >< at > -227,7 +229,7 < at >< at > static struct scsi_host_template driver_ #include "scsi_module.c" -int a2091_release(struct Scsi_Host *instance) +static int a2091_release(struct Scsi_Host *instance) { #ifdef MODULE DMA(instance)->CNTR = 0; diff -puN drivers/scsi/a2091.h~drivers-scsi-a2091c-make-2-functions-static drivers/scsi/a2091.h --- a/drivers/scsi/a2091.h~drivers-scsi-a2091c-make-2-functions-static +++ a/drivers/scsi/a2091.h < at >< at > -11,9 +11,6 < at >< at > #include <linux/types.h> -int a2091_detect(struct scsi_host_template *); -int a2091_release(struct Scsi_Host *); - #ifndef CMD_PER_LUN #define CMD_PER_LUN 2 #endif _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:32:11 http://permalink.gmane.org/gmane.linux.scsi/46418 From: Harvey Harrison <harvey.harrison< at >gmail.com> Also use the hi/lo helpers. Signed-off-by: Harvey Harrison <harvey.harrison< at >gmail.com> Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/scsi/ibmmca.c | 3 +-- drivers/scsi/ultrastor.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff -puN drivers/scsi/ibmmca.c~scsi-use-the-common-hex_asc-array-rather-than-a-private-one drivers/scsi/ibmmca.c --- a/drivers/scsi/ibmmca.c~scsi-use-the-common-hex_asc-array-rather-than-a-private-one +++ a/drivers/scsi/ibmmca.c < at >< at > -1002,12 +1002,11 < at >< at > static char *ti_p(int dev) /* interpreter for logical device numbers (ldn) */ static char *ti_l(int val) { -const char hex[16] = "0123456789abcdef"; static char answer[2]; answer[1] = (char) (0x0); if (val <= MAX_LOG_DEV) -answer[0] = hex[val]; +answer[0] = hex_asc[val]; else answer[0] = '-'; return (char *) &answer; diff -puN drivers/scsi/ultrastor.c~scsi-use-the-common-hex_asc-array-rather-than-a-private-one drivers/scsi/ultrastor.c --- a/drivers/scsi/ultrastor.c~scsi-use-the-common-hex_asc-array-rather-than-a-private-one +++ a/drivers/scsi/ultrastor.c < at >< at > -876,8 +876,8 < at >< at > static int ultrastor_abort(struct scsi_c for (i = 0; i < 16; i++) { unsigned char p = inb(port0 + i); - out[28 + i * 3] = "0123456789abcdef"[p >> 4]; - out[29 + i * 3] = "0123456789abcdef"[p & 15]; + out[28 + i * 3] = hex_asc_hi(p); + out[29 + i * 3] = hex_asc_lo(p); out[30 + i * 3] = ' '; } out[28 + i * 3] = '\n'; _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:32:11 http://permalink.gmane.org/gmane.linux.scsi/46417 From: Alexey Dobriyan <adobriyan< at >gmail.com> Signed-off-by: Alexey Dobriyan <adobriyan< at >gmail.com> Cc: "Moore, Eric Dean" <Eric.Moore< at >lsi.com> Cc: James Bottomley <James.Bottomley< at >HansenPartnership.com> Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/message/fusion/mptbase.h | 11 ----------- 1 file changed, 11 deletions(-) diff -puN drivers/message/fusion/mptbase.h~mpt-remove-unused-struct-mpt_proc_entry_t drivers/message/fusion/mptbase.h --- a/drivers/message/fusion/mptbase.h~mpt-remove-unused-struct-mpt_proc_entry_t +++ a/drivers/message/fusion/mptbase.h < at >< at > -402,17 +402,6 < at >< at > typedef struct _VirtDevice { #define MPT_TARGET_FLAGS_RAID_COMPONENT0x40 #define MPT_TARGET_FLAGS_LED_ON0x80 -/* - */proc/mpt interface - */ -typedef struct { -const char*name; -mode_t mode; -int pad; -read_proc_t*read_proc; -write_proc_t*write_proc; -} mpt_proc_entry_t; - #define MPT_PROC_READ_RETURN(buf,start,offset,request,eof,len) \ do { \ len -= offset;\ _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:32:10 http://permalink.gmane.org/gmane.linux.scsi/46416 From: Adrian Bunk <bunk< at >kernel.org> #if 0 the unused ses_match_host() Signed-off-by: Adrian Bunk <bunk< at >kernel.org> Cc: James Bottomley <James.Bottomley< at >steeleye.com> Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/scsi/ses.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/scsi/ses.c~if-0-ses_match_host drivers/scsi/ses.c --- a/drivers/scsi/ses.c~if-0-ses_match_host +++ a/drivers/scsi/ses.c < at >< at > -264,6 +264,7 < at >< at > struct ses_host_edev { struct enclosure_device *edev; }; +#if 0 int ses_match_host(struct enclosure_device *edev, void *data) { struct ses_host_edev *sed = data; < at >< at > -280,6 +281,7 < at >< at > int ses_match_host(struct enclosure_devi sed->edev = edev; return 1; } +#endif /* 0 */ static void ses_process_descriptor(struct enclosure_component *ecomp, unsigned char *desc) _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:32:08 http://permalink.gmane.org/gmane.linux.scsi/46415 Seokmann Ju wrote: I didn't think we needed to mandate this. So, I've left it in the position where the transport allows it to be more than one, but the driver is free to reject it if it desires. That said, I wouldn't expect an ELS to be more than 1 buffer. If everyone feels strongly enough about it - we can make this restriction. However, we can't do this on CT operations. James Smart 2008-12-01T22:09:48 http://permalink.gmane.org/gmane.linux.scsi/46414 From: Tomas Henzl <thenzl< at >redhat.com> A lot of 64bit machines with Adaptec 2200S and 2120S controllers don't recognize SCSI disks any more with the patch "fix driver failure with Dell PowerEdge Expandable RAID Controller 3/Di", but fail with tons of "aac_srb: aac_fib_send failed with status: 8195" instead. This patch disables the quirk introduced in the change cited above for those two controllers again. Signed-off-by: Gernot Hillier <gernot.hillier< at >siemens.com> Signed-off-by: Tomas Henzl <thenzl< at >redhat.com> Cc: <aacraid< at >adaptec.com> Cc: James Bottomley <James.Bottomley< at >HansenPartnership.com> Tested-by: Thomas Guyot-Sionnest <dermoth< at >aei.ca> Cc: "Leubner, Achim" <Achim_Leubner< at >adaptec.com> Cc: <stable< at >kernel.org>[2.6.27.x, 2.6.26.x, 2.6.25.x] Signed-off-by: Andrew Morton <akpm< at >linux-foundation.org> --- drivers/scsi/aacraid/linit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/scsi/aacraid/linit.c~aacraid-disable-dell-percraid-quirk-on-adaptec-2200s-and-2120s drivers/scsi/aacraid/linit.c --- a/drivers/scsi/aacraid/linit.c~aacraid-disable-dell-percraid-quirk-on-adaptec-2200s-and-2120s +++ a/drivers/scsi/aacraid/linit.c < at >< at > -175,8 +175,8 < at >< at > static struct aac_driver_ident aac_drive { aac_rx_init, "percraid", "DELL ", "PERCRAID ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* PERC 3/Di (Boxster/PERC3DiB) */ { aac_rx_init, "aacraid", "ADAPTEC ", "catapult ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* catapult */ { aac_rx_init, "aacraid", "ADAPTEC ", "tomcat ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* tomcat */ -{ aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2120S ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2120S (Crusader) */ -{ aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2200S (Vulcan) */ +{ aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2120S ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Adaptec 2120S (Crusader) */ +{ aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Adaptec 2200S (Vulcan) */ { aac_rx_init, "aacraid", "ADAPTEC ", "Adaptec 2200S ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Adaptec 2200S (Vulcan-2m) */ { aac_rx_init, "aacraid", "Legend ", "Legend S220 ", 1, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S220 (Legend Crusader) */ { aac_rx_init, "aacraid", "Legend ", "Legend S230 ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend S230 (Legend Vulcan) */ _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html akpm< at >linux-foundation.org 2008-12-01T22:04:12 http://permalink.gmane.org/gmane.linux.scsi/46413 Hi James, On Nov 25, 2008, at 6:38 AM, Seokmann Ju wrote: [snip] One minor questions/clarification. If I understood correctly, ELS only supports single sg. If this is true, shouldn't it checked somewhere before the transport layer calls LLD? Thank you, Seokmann -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Seokmann Ju 2008-12-01T21:49:31 http://permalink.gmane.org/gmane.linux.scsi/46412 Boaz Harrosh wrote: I see. If it's about performance, it should be done, no doubts. But I have another likely stupid question, answer for which I have been going to find out for long time, but always have no time. Maybe, you can help me, BTW, please? Why is block layer involved in SCSI commands execution for non-block cases, like st and sg? Sg isn't intended to be actively used for data transfers with block devices, for them there are sd and bsg interfaces, right? Wouldn't for them path memory=>sg-lists=>driver via SCSI mid-layer be simpler and all those alignment, draining, sizes, etc. issues can't be handled by some library, which both SCSI and block subsystems use? I have feeling, maybe wrong, that currently performance for non-block cases is sacrificed for block case. Thanks, Vlad -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Vladislav Bolkhovitin 2008-12-01T18:17:29 http://permalink.gmane.org/gmane.linux.scsi/46411 From: Mike Christie <michaelc< at >cs.wisc.edu> This regression was added in 2.6.27, when the mtask and ctask were merged into the the common task struct. The patch applies to scsi-rc-fixes, but also applies to 2.6.27 with some offsets. The problem is that __iscsi_conn_send_pdu assumes that userspace was not sending nops with the format it is checking for in the "if" below. It turns out that older userspace tools are. This patch moves the setting of the internal ping_task tracker (it tracks libiscsi current outstanding nop) to iscsi_send_nopout which is only used by kernel callers. Signed-off-by: Mike Christie <michaelc< at >cs.wisc.edu> --- drivers/scsi/libiscsi.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 801c7cf..3fdee73 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c < at >< at > -489,12 +489,6 < at >< at > __iscsi_conn_send_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr, if (!__kfifo_get(session->cmdpool.queue, (void*)&task, sizeof(void*))) return NULL; - -if ((hdr->opcode == (ISCSI_OP_NOOP_OUT | ISCSI_OP_IMMEDIATE)) && - hdr->ttt == RESERVED_ITT) { -conn->ping_task = task; -conn->last_ping = jiffies; -} } /* * released in complete pdu for task we expect a response for, and < at >< at > -703,6 +697,11 < at >< at > static void iscsi_send_nopout(struct iscsi_conn *conn, struct iscsi_nopin *rhdr) task = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)&hdr, NULL, 0); if (!task) iscsi_conn_printk(KERN_ERR, conn, "Could not send nopout\n"); +else if (!rhdr) { +/* only track our nops */ +conn->ping_task = task; +conn->last_ping = jiffies; +} } static int iscsi_handle_reject(struct iscsi_conn *conn, struct iscsi_hdr *hdr, michaelc< at >cs.wisc.edu 2008-12-01T18:13:00 http://permalink.gmane.org/gmane.linux.scsi/46410 http://bugzilla.kernel.org/show_bug.cgi?id=12119 ------- Comment #4 from anonymous< at >kernel-bugs.osdl.org 2008-12-01 08:20 ------- Reply-To: michaelc< at >cs.wisc.edu bugme-daemon< at >bugzilla.kernel.org wrote: Ok. I will submit a patch. Thanks for the report and testing. I did not mean to upgrade to all F10 or F9 - just the iscsi package in there. The code across them is the same more or less. F9 and F8 were the same for iscsi, so if you use: http://mirrors.kernel.org/fedora/updates/9/x86_64.newkey/iscsi-initiator-utils-6.2.0.870-1.0.fc9.x86_64.rpm (for i386 or ppc then swap the x86_64 refs for your arch) on F8 then you should be ok. bugme-daemon< at >bugzilla.kernel.org 2008-12-01T16:20:11 http://permalink.gmane.org/gmane.linux.scsi/46409 Ok. I will submit a patch. Thanks for the report and testing. I did not mean to upgrade to all F10 or F9 - just the iscsi package in there. The code across them is the same more or less. F9 and F8 were the same for iscsi, so if you use: http://mirrors.kernel.org/fedora/updates/9/x86_64.newkey/iscsi-initiator-utils-6.2.0.870-1.0.fc9.x86_64.rpm (for i386 or ppc then swap the x86_64 refs for your arch) on F8 then you should be ok. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Mike Christie 2008-12-01T16:19:56 http://permalink.gmane.org/gmane.linux.scsi/46408 I'm not so sure about that... There's still a window in which the directory is visible but empty; it's just smaller than before. Besides, the window that really matters is between sending out the uevent notification (during device_add) and populating the directory. The patch doesn't address that problem. Should it? Alan Stern -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Alan Stern 2008-12-01T15:51:42 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.linux.scsi