Skip to contentSkip to conversation

IDE fixes

GIT PULL Bartlomiej Zolnierkiewicz 2 participants 3 messages May 16, 2009 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

ide-tape oops fix, icside regression fix and new piix cable quirk

Linus, please pull from 'for-linus' branch of:

master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git for-linus

to receive the following updates:

 drivers/ide/icside.c   |    2 +-
 drivers/ide/ide-tape.c |    6 ------
 drivers/ide/piix.c     |    1 +
 3 files changed, 2 insertions(+), 7 deletions(-)

Alan Cox (1):
piix: The Sony TZ90 needs the cable type hardcoding

Sergei Shtylyov (1):
icside: register second channel of version 6 PCB

Tejun Heo (1):
ide-tape: remove back-to-back REQUEST_SENSE detection

drivers/ide/icside.c +1 -1
index 4e16ce6..36da913 100644
@@ -466,7 +466,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 	struct ide_host *host;
 	unsigned int sel = 0;
 	int ret;
-	hw_regs_t hw[2], *hws[] = { &hw[0], NULL, NULL, NULL };
+	hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1], NULL, NULL };
 	struct ide_port_info d = icside_v6_port_info;
 
 	ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
drivers/ide/ide-tape.c +0 -6
index cb942a9..3a53e08 100644
@@ -614,12 +614,6 @@ static ide_startstop_t ide_tape_issue_pc(ide_drive_t *drive,
 {
 	idetape_tape_t *tape = drive->driver_data;
 
-	if (drive->pc->c[0] == REQUEST_SENSE &&
-	    pc->c[0] == REQUEST_SENSE) {
-		printk(KERN_ERR "ide-tape: possible ide-tape.c bug - "
-			"Two request sense in serial were issued\n");
-	}
-
 	if (drive->failed_pc == NULL && pc->c[0] != REQUEST_SENSE)
 		drive->failed_pc = pc;
drivers/ide/piix.c +1 -0
index 2aa6999..69860de 100644
@@ -263,6 +263,7 @@ static const struct ich_laptop ich_laptop[] = {
 	{ 0x24CA, 0x1025, 0x003d },	/* ICH4 on ACER TM290 */
 	{ 0x266F, 0x1025, 0x0066 },	/* ICH6 on ACER Aspire 1694WLMi */
 	{ 0x2653, 0x1043, 0x82D8 },	/* ICH6M on Asus Eee 701 */
+	{ 0x27df, 0x104d, 0x900e },	/* ICH7 on Sony TZ-90 */
 	/* end marker */
 	{ 0, }
 };
#1 lore raw

Hi,

Quoted 15 lines · Bartlomiej Zolnierkiewicz

ide-tape oops fix, icside regression fix and new piix cable quirk

Linus, please pull from 'for-linus' branch of:

master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git for-linus

to receive the following updates:

 drivers/ide/icside.c   |    2 +-
 drivers/ide/ide-tape.c |    6 ------
 drivers/ide/piix.c     |    1 +
 3 files changed, 2 insertions(+), 7 deletions(-)
Quoted 8 lines

Alan Cox (1):
piix: The Sony TZ90 needs the cable type hardcoding

Sergei Shtylyov (1):
icside: register second channel of version 6 PCB

Tejun Heo (1):
ide-tape: remove back-to-back REQUEST_SENSE detection

I assume it is too late to add another ide-tape debug build fix I told you about earlier today:

--
From: Mark de Wever <[email protected]>
Date: Sat, 16 May 2009 18:17:30 +0200
Subject: [PATCH] ide-tape: fix debug call

This error only occurs when IDETAPE_DEBUG_LOG is enabled.

Signed-off-by Mark de Wever <[email protected]>
---
 drivers/ide/ide-tape.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/ide/ide-tape.c +1 -1
index 9ca2665..521a5f5 100644
@@ -592,7 +592,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
 	struct ide_cmd cmd;
 	u8 stat;
 
-	debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n"
+	debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n",
 		  (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq));
 
 	if (!(blk_special_request(rq) || blk_sense_request(rq))) {
Signature · 9 lines
1.6.3

If so, you could still queue it for 30-rc7 if there would be one...

Thanks.

-- 
Regards/Gruss,
    Boris.
author
#2 lore raw
Quoted 21 lines · On Saturday 16 May 2009 21:22:19 Borislav Petkov wrote:

Hi,

Quoted 18 lines · Bartlomiej Zolnierkiewicz

ide-tape oops fix, icside regression fix and new piix cable quirk

Linus, please pull from 'for-linus' branch of:

master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git for-linus

to receive the following updates:

 drivers/ide/icside.c   |    2 +-
 drivers/ide/ide-tape.c |    6 ------
 drivers/ide/piix.c     |    1 +
 3 files changed, 2 insertions(+), 7 deletions(-)

Alan Cox (1):
piix: The Sony TZ90 needs the cable type hardcoding

Quoted 8 lines
Quoted 5 lines

Sergei Shtylyov (1):
icside: register second channel of version 6 PCB

Tejun Heo (1):
ide-tape: remove back-to-back REQUEST_SENSE detection

I assume it is too late to add another ide-tape debug build fix I told you about earlier today:

No its too early -- this patch doesn't even apply to Linus' tree.

[ It applies on top of all 2.6.31 block+ide changes... ]

Quoted 31 lines

--
From: Mark de Wever <[email protected]>
Date: Sat, 16 May 2009 18:17:30 +0200
Subject: [PATCH] ide-tape: fix debug call

This error only occurs when IDETAPE_DEBUG_LOG is enabled.

Signed-off-by Mark de Wever <[email protected]>
---
 drivers/ide/ide-tape.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/ide/ide-tape.c +1 -1
index 9ca2665..521a5f5 100644
@@ -592,7 +592,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
 	struct ide_cmd cmd;
 	u8 stat;
 
-	debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n"
+	debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n",
 		  (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq));
 
 	if (!(blk_special_request(rq) || blk_sense_request(rq))) {
Signature · 5 lines
1.6.3

If so, you could still queue it for 30-rc7 if there would be one...

Thanks.