Re: [PATCH 1/2] libata: add CFA specific identify data words

[Sergei Shtylyov <sshtylyov@ru.mvista.com>]

Sergei Shtylyov wrote:

> Declare and use constants for CFA specific identify data words 162 and 163.

> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

    Jeff, have you forgotten about this one too?

> Index: linux-2.6/drivers/ata/libata-core.c
> ===================================================================
> --- linux-2.6.orig/drivers/ata/libata-core.c
> +++ linux-2.6/drivers/ata/libata-core.c
> @@ -1650,8 +1650,8 @@ unsigned long ata_id_xfermask(const u16 
>  		/*
>  		 *	Process compact flash extended modes
>  		 */
> -		int pio = id[163] & 0x7;
> -		int dma = (id[163] >> 3) & 7;
> +		int pio = (id[ATA_ID_CFA_MODES] >> 0) & 0x7;
> +		int dma = (id[ATA_ID_CFA_MODES] >> 3) & 0x7;
>  
>  		if (pio)
>  			pio_mask |= (1 << 5);
> @@ -2408,7 +2408,8 @@ int ata_dev_configure(struct ata_device 
>  	/* ATA-specific feature tests */
>  	if (dev->class == ATA_DEV_ATA) {
>  		if (ata_id_is_cfa(id)) {
> -			if (id[162] & 1) /* CPRM may make this media unusable */
> +			/* CPRM may make this media unusable */
> +			if (id[ATA_ID_CFA_KEY_MGMT] & 1)
>  				ata_dev_printk(dev, KERN_WARNING,
>  					       "supports DRM functions and may "
>  					       "not be fully accessable.\n");

MBR, Sergei