From: Chris Wright <chrisw@sous-sol.org>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
Chris Wedgwood <reviews@ml.cw.f00f.org>,
Michael Krufky <mkrufky@linuxtv.org>,
Chuck Ebbert <cebbert@redhat.com>,
Domenico Andreoli <cavokz@gmail.com>, Willy Tarreau <w@1wt.eu>,
Rodrigo Rubira Branco <rbranco@la.checkpoint.com>,
Jake Edge <jake@lwn.net>, Eugene Teo <eteo@redhat.com>,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, Boaz Harrosh <bharrosh@panasas.com>,
Matthieu CASTET <castet.matthieu@free.fr>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Matthew Dharm <mdharm-kernel@one-eyed-alien.net>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [patch 09/45] USB: fix USB_STORAGE_CYPRESS_ATACB
Date: Tue, 31 Mar 2009 16:10:54 -0700 [thread overview]
Message-ID: <20090331231416.325188367@sous-sol.org> (raw)
In-Reply-To: 20090331231045.719396245@sous-sol.org
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: usb-fix-usb_storage_cypress_atacb.patch --]
[-- Type: text/plain, Size: 2839 bytes --]
-stable review patch. If anyone has any objections, please let us know.
---------------------
From: Boaz Harrosh <bharrosh@panasas.com>
upstream commit: 1f4159c1620f74377e26d8a569d10ca5907ef475
commit 64a87b24: [SCSI] Let scsi_cmnd->cmnd use request->cmd buffer
changed the scsi_eh_prep_cmnd logic by making it clear
the ->cmnd buffer. But the sat to cypress atacb translation supposed
the ->cmnd buffer wasn't modified.
This patch makes it set the ->cmnd buffer after scsi_eh_prep_cmnd call.
The problem and a fix was reported by Matthieu CASTET <castet.matthieu@free.fr>
It also removes all the hackery fiddling of scsi_cmnd and scsi_eh_save by
requesting from scsi_eh_prep_cmnd to prepare a read into ->sense_buffer,
which is much more suitable a buffer for HW transfers, then after the command
execution the regs read is copied into regs buffer before actual preparation
of sense_buffer.
Also fix an alien comment character to my utf-8 editor.
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
Cc: stable <stable@kernel.org>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Matthew Dharm <mdharm-kernel@one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---
drivers/usb/storage/cypress_atacb.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
--- a/drivers/usb/storage/cypress_atacb.c
+++ b/drivers/usb/storage/cypress_atacb.c
@@ -133,19 +133,18 @@ void cypress_atacb_passthrough(struct sc
/* build the command for
* reading the ATA registers */
- scsi_eh_prep_cmnd(srb, &ses, NULL, 0, 0);
- srb->sdb.length = sizeof(regs);
- sg_init_one(&ses.sense_sgl, regs, srb->sdb.length);
- srb->sdb.table.sgl = &ses.sense_sgl;
- srb->sc_data_direction = DMA_FROM_DEVICE;
- srb->sdb.table.nents = 1;
+ scsi_eh_prep_cmnd(srb, &ses, NULL, 0, sizeof(regs));
+
/* we use the same command as before, but we set
* the read taskfile bit, for not executing atacb command,
* but reading register selected in srb->cmnd[4]
*/
+ srb->cmd_len = 16;
+ srb->cmnd = ses.cmnd;
srb->cmnd[2] = 1;
usb_stor_transparent_scsi_command(srb, us);
+ memcpy(regs, srb->sense_buffer, sizeof(regs));
tmp_result = srb->result;
scsi_eh_restore_cmnd(srb, &ses);
/* we fail to get registers, report invalid command */
@@ -162,8 +161,8 @@ void cypress_atacb_passthrough(struct sc
/* XXX we should generate sk, asc, ascq from status and error
* regs
- * (see 11.1 Error translation ATA device error to SCSI error map)
- * and ata_to_sense_error from libata.
+ * (see 11.1 Error translation ATA device error to SCSI error
+ * map, and ata_to_sense_error from libata.)
*/
/* Sense data is current and format is descriptor. */
next prev parent reply other threads:[~2009-03-31 23:27 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-31 23:10 [patch 00/45] 2.6.29.1 -stable review Chris Wright
2009-03-31 23:10 ` [patch 01/45] netfilter: nf_conntrack_tcp: fix unaligned memory access in tcp_sack Chris Wright
2009-03-31 23:10 ` [patch 02/45] udp: Wrong locking code in udp seq_file infrastructure Chris Wright
2009-03-31 23:10 ` [patch 03/45] dnet: drivers/net/dnet.c needs <linux/io.h> Chris Wright
2009-03-31 23:10 ` [patch 04/45] bridge: bad error handling when adding invalid ether address Chris Wright
2009-03-31 23:10 ` [patch 05/45] GRO: Disable GRO on legacy netif_rx path Chris Wright
2009-03-31 23:10 ` [patch 06/45] ipv6: Plug sk_buff leak in ipv6_rcv (net/ipv6/ip6_input.c) Chris Wright
2009-03-31 23:10 ` [patch 07/45] xfrm: spin_lock() should be spin_unlock() in xfrm_state.c Chris Wright
2009-03-31 23:10 ` [patch 08/45] USB: EHCI: add software retry for transaction errors Chris Wright
2009-03-31 23:10 ` Chris Wright [this message]
2009-03-31 23:10 ` [patch 10/45] USB: usb-storage: increase max_sectors for tape drives Chris Wright
2009-03-31 23:10 ` [patch 11/45] USB: gadget: fix rndis regression Chris Wright
2009-03-31 23:10 ` [patch 12/45] USB: add quirk to avoid config and interface strings Chris Wright
2009-03-31 23:10 ` [patch 13/45] KVM: VMX: Dont allow uninhibited access to EFER on i386 Chris Wright
2009-03-31 23:10 ` [patch 14/45] KVM: SVM: set accessed bit for VMCB segment selectors Chris Wright
2009-03-31 23:11 ` [patch 15/45] ath9k: downgrade xmit queue full message to xmit debug Chris Wright
2009-03-31 23:11 ` [patch 16/45] cifs: fix buffer format byte on NT Rename/hardlink Chris Wright
2009-03-31 23:11 ` [patch 17/45] ath5k: use spin_lock_irqsave for beacon lock Chris Wright
2009-03-31 23:11 ` [patch 18/45] ath9k: fix dma mapping leak of rx buffer upon rmmod Chris Wright
2009-03-31 23:11 ` [patch 19/45] b43: fix b43_plcp_get_bitrate_idx_ofdm return type Chris Wright
2009-03-31 23:11 ` [patch 20/45] ath5k: disable MIB interrupts Chris Wright
2009-03-31 23:11 ` [patch 21/45] ath5k: warn and correct rate for unknown hw rate indexes Chris Wright
2009-03-31 23:11 ` [patch 22/45] CIFS: Fix memory overwrite when saving nativeFileSystem field during mount Chris Wright
2009-03-31 23:11 ` [patch 23/45] cfg80211: force last_request to be set for OLD_REG if regdom is EU Chris Wright
2009-03-31 23:11 ` [patch 24/45] DVB: firedtv: FireDTV S2 problems with tuning solved Chris Wright
2009-03-31 23:11 ` [patch 25/45] SCSI: sg: fix races during device removal Chris Wright
2009-03-31 23:31 ` Linus Torvalds
2009-04-01 0:10 ` James Bottomley
2009-04-01 0:18 ` Linus Torvalds
2009-04-01 1:15 ` Chris Wright
2009-04-01 1:54 ` FUJITA Tomonori
2009-04-01 15:18 ` Tony Battersby
2009-03-31 23:11 ` [patch 26/45] SCSI: sg: fix races with ioctl(SG_IO) Chris Wright
2009-03-31 23:11 ` [patch 27/45] SCSI: sg: avoid blk_put_request/blk_rq_unmap_user in interrupt Chris Wright
2009-03-31 23:11 ` [patch 28/45] ARM: pxa: fix overlay being un-necessarily initialized on pxa25x Chris Wright
2009-03-31 23:11 ` [patch 29/45] ARM: 5428/1: Module relocation update for R_ARM_V4BX Chris Wright
2009-03-31 23:11 ` [patch 30/45] ARM: cumana: Fix a long standing bogon Chris Wright
2009-03-31 23:11 ` [patch 31/45] ARM: fix leak in iop13xx/pci Chris Wright
2009-03-31 23:11 ` [patch 32/45] ARM: twl4030 - leak fix Chris Wright
2009-03-31 23:11 ` [patch 33/45] ARM: 5435/1: fix compile warning in sanity_check_meminfo() Chris Wright
2009-03-31 23:11 ` [patch 34/45] fuse: fix fuse_file_lseek returning with lock held Chris Wright
2009-03-31 23:11 ` [patch 35/45] Add a missing unlock_kernel() in raw_open() Chris Wright
2009-03-31 23:11 ` [patch 36/45] x86, PAT, PCI: Change vma prot in pci_mmap to reflect inherited prot Chris Wright
2009-03-31 23:11 ` [patch 37/45] x86, uv: fix cpumask iterator in uv_bau_init() Chris Wright
2009-03-31 23:11 ` [patch 38/45] x86: fix 64k corruption-check Chris Wright
2009-03-31 23:11 ` [patch 39/45] x86: ptrace, bts: fix an unreachable statement Chris Wright
2009-03-31 23:11 ` [patch 40/45] x86: mtrr: dont modify RdDram/WrDram bits of fixed MTRRs Chris Wright
2009-03-31 23:11 ` [patch 41/45] VM, x86, PAT: Change is_linear_pfn_mapping to not use vm_pgoff Chris Wright
2009-03-31 23:11 ` [patch 42/45] lguest: wire up pte_update/pte_update_defer Chris Wright
2009-03-31 23:11 ` [patch 43/45] lguest: fix spurious BUG_ON() on invalid guest stack Chris Wright
2009-03-31 23:11 ` [patch 44/45] cfg80211: fix incorrect assumption on last_request for 11d Chris Wright
2009-03-31 23:11 ` [patch 45/45] KVM: MMU: Fix another largepage memory leak Chris Wright
2009-04-01 3:47 ` [patch 00/45] 2.6.29.1 -stable review David Miller
2009-04-01 4:42 ` Michael Krufky
2009-04-02 6:57 ` Chris Wright
2009-04-02 6:57 ` [PATCH 46/45] sparc64: Fix MM refcount check in smp_flush_tlb_pending() Chris Wright
2009-04-02 6:57 ` [PATCH 47/45] sparc64: Flush TLB before releasing pages Chris Wright
2009-04-02 6:58 ` [PATCH 48/45] sparc64: Fix reset hangs on Niagara systems Chris Wright
2009-04-02 6:58 ` [PATCH 49/45] V4L: v4l2-common: remove incorrect MODULE test Chris Wright
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090331231416.325188367@sous-sol.org \
--to=chrisw@sous-sol.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=bharrosh@panasas.com \
--cc=castet.matthieu@free.fr \
--cc=cavokz@gmail.com \
--cc=cebbert@redhat.com \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=eteo@redhat.com \
--cc=gregkh@suse.de \
--cc=jake@lwn.net \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mdharm-kernel@one-eyed-alien.net \
--cc=mkrufky@linuxtv.org \
--cc=rbranco@la.checkpoint.com \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=w@1wt.eu \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).