mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
[PATCH] scan all enabled ports on ata_piix
ICH6 spec defines the PORT_ bits as: PORT_ENABLED (R/W): 0 = Disabled. The port is in the off state and cannot detect any devices. 1 = Enabled. The port can transition between the on, partial, and slumber states and can detect devices. PORT_PRESENT (R/O) The status of this bit may change at any time. This bit is cleared when the port is disabled via PORT_ENABLED. This bit is not cleared upon surprise removal of a device. So from a textual view it is not necessary that PORT_PRESENT _must_ be set, especially if a device detection has to be done anyway. And, in fact, this is the view that ACER has been taken with its new Laptops (e.g. Travelmate 4150). And the definition of PORT_ENABLED / PORT_PRESENT is mixed up, btw. Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@suse.de> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
5a2cec83a9
commit
6a690df5c8
1 changed files with 6 additions and 4 deletions
|
@ -68,8 +68,8 @@ enum {
|
|||
PIIX_COMB_PATA_P0 = (1 << 1),
|
||||
PIIX_COMB = (1 << 2), /* combined mode enabled? */
|
||||
|
||||
PIIX_PORT_PRESENT = (1 << 0),
|
||||
PIIX_PORT_ENABLED = (1 << 4),
|
||||
PIIX_PORT_ENABLED = (1 << 0),
|
||||
PIIX_PORT_PRESENT = (1 << 4),
|
||||
|
||||
PIIX_80C_PRI = (1 << 5) | (1 << 4),
|
||||
PIIX_80C_SEC = (1 << 7) | (1 << 6),
|
||||
|
@ -377,7 +377,9 @@ static void piix_pata_phy_reset(struct ata_port *ap)
|
|||
* None (inherited from caller).
|
||||
*
|
||||
* RETURNS:
|
||||
* Non-zero if device detected, zero otherwise.
|
||||
* Non-zero if port is enabled, it may or may not have a device
|
||||
* attached in that case (PRESENT bit would only be set if BIOS probe
|
||||
* was done). Zero is returned if port is disabled.
|
||||
*/
|
||||
static int piix_sata_probe (struct ata_port *ap)
|
||||
{
|
||||
|
@ -401,7 +403,7 @@ static int piix_sata_probe (struct ata_port *ap)
|
|||
*/
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
mask = (PIIX_PORT_PRESENT << i) | (PIIX_PORT_ENABLED << i);
|
||||
mask = (PIIX_PORT_ENABLED << i);
|
||||
|
||||
if ((orig_mask & mask) == mask)
|
||||
if (combined || (i == ap->hard_port_no))
|
||||
|
|
Loading…
Reference in a new issue