From b513e87696031556a57181343cd236379ee9a3df Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sun, 1 Feb 2009 10:56:31 +0900 Subject: [PATCH] --- yaml --- r: 130809 b: refs/heads/master c: 8d993eaa9c3c61b8a5929a7f695078a1fcfb4869 h: refs/heads/master i: 130807: 2b71bb00730aa560f0e6100ce91e0f758a94e63e v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_nv.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b4b2d3746bb4..194b60b0762f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2999b58b795ad81f10e34bdbbfd2742172f247e4 +refs/heads/master: 8d993eaa9c3c61b8a5929a7f695078a1fcfb4869 diff --git a/trunk/drivers/ata/sata_nv.c b/trunk/drivers/ata/sata_nv.c index c49ad0e61b6f..444af0415ca1 100644 --- a/trunk/drivers/ata/sata_nv.c +++ b/trunk/drivers/ata/sata_nv.c @@ -436,11 +436,16 @@ static struct ata_port_operations nv_nf2_ops = { .hardreset = nv_noclassify_hardreset, }; -/* CK804 finally gets hardreset right */ +/* For initial probing after boot and hot plugging, hardreset mostly + * works fine on CK804 but curiously, reprobing on the initial port by + * rescanning or rmmod/insmod fails to acquire the initial D2H Reg FIS + * in somewhat undeterministic way. Use noclassify hardreset. + */ static struct ata_port_operations nv_ck804_ops = { .inherits = &nv_common_ops, .freeze = nv_ck804_freeze, .thaw = nv_ck804_thaw, + .hardreset = nv_noclassify_hardreset, .host_stop = nv_ck804_host_stop, };