Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a3b7512 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-disk: merge LBA28 and LBA48 Host Protected Area support code (take 2) 



* Merge idedisk_{read_native,set}_max_address_ext() into
  idedisk_{read_native,set}_max_address().

v2:
* Remove LBA48 code leftover from idedisk_read_native_max_address()
  ('high' variable initialization).  (Noticed by Sergei).

There should be no functionality changes caused by this patch.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 650d841d

drivers/ide/ide-disk.c

+32 −71
Original line number Diff line number Diff line
@@ -307,40 +307,19 @@ static ide_startstop_t ide_do_rw_disk (ide_drive_t *drive, struct request *rq, s 
 * Queries for true maximum capacity of the drive.

 * Returns maximum LBA address (> 0) of the drive, 0 if failed.

 */

static unsigned long idedisk_read_native_max_address(ide_drive_t *drive)

static u64 idedisk_read_native_max_address(ide_drive_t *drive, int lba48)

{

	ide_task_t args;

	struct ide_taskfile *tf = &args.tf;

	unsigned long addr = 0;

	u64 addr = 0;



	/* Create IDE/ATA command request structure */

	memset(&args, 0, sizeof(ide_task_t));

	tf->device  = ATA_LBA;

	if (lba48)

		tf->command = WIN_READ_NATIVE_MAX_EXT;

	else

		tf->command = WIN_READ_NATIVE_MAX;

	args.command_type			= IDE_DRIVE_TASK_NO_DATA;

	args.handler				= &task_no_data_intr;

	/* submit command request */

	ide_raw_taskfile(drive, &args, NULL);



	/* if OK, compute maximum address value */

	if ((tf->status & 0x01) == 0) {

		addr = ((tf->device & 0xf) << 24) |

		       (tf->lbah << 16) | (tf->lbam << 8) | tf->lbal;

		addr++;	/* since the return value is (maxlba - 1), we add 1 */

	}

	return addr;

}



static unsigned long long idedisk_read_native_max_address_ext(ide_drive_t *drive)

{

	ide_task_t args;

	struct ide_taskfile *tf = &args.tf;

	unsigned long long addr = 0;



	/* Create IDE/ATA command request structure */

	memset(&args, 0, sizeof(ide_task_t));

	tf->device  = ATA_LBA;

	tf->command = WIN_READ_NATIVE_MAX_EXT;

	args.command_type			= IDE_DRIVE_TASK_NO_DATA;

	args.handler				= &task_no_data_intr;

	/* submit command request */
@@ -350,7 +329,11 @@ static unsigned long long idedisk_read_native_max_address_ext(ide_drive_t *drive 
	if ((tf->status & 0x01) == 0) {

		u32 high, low;



		high = (tf->hob_lbah << 16) | (tf->hob_lbam << 8) | tf->hob_lbal;

		if (lba48)

			high = (tf->hob_lbah << 16) | (tf->hob_lbam << 8) |

				tf->hob_lbal;

		else

			high = tf->device & 0xf;

		low  = (tf->lbah << 16) | (tf->lbam << 8) | tf->lbal;

		addr = ((__u64)high << 24) | low;

		addr++;	/* since the return value is (maxlba - 1), we add 1 */
@@ -362,38 +345,11 @@ static unsigned long long idedisk_read_native_max_address_ext(ide_drive_t *drive 
 * Sets maximum virtual LBA address of the drive.

 * Returns new maximum virtual LBA address (> 0) or 0 on failure.

 */

static unsigned long idedisk_set_max_address(ide_drive_t *drive, unsigned long addr_req)

static u64 idedisk_set_max_address(ide_drive_t *drive, u64 addr_req, int lba48)

{

	ide_task_t args;

	struct ide_taskfile *tf = &args.tf;

	unsigned long addr_set = 0;

	

	addr_req--;

	/* Create IDE/ATA command request structure */

	memset(&args, 0, sizeof(ide_task_t));

	tf->lbal    =  (addr_req >>  0) & 0xff;

	tf->lbam    =  (addr_req >>  8) & 0xff;

	tf->lbah    =  (addr_req >> 16) & 0xff;

	tf->device  = ((addr_req >> 24) & 0x0f) | ATA_LBA;

	tf->command = WIN_SET_MAX;

	args.command_type			= IDE_DRIVE_TASK_NO_DATA;

	args.handler				= &task_no_data_intr;

	/* submit command request */

	ide_raw_taskfile(drive, &args, NULL);

	/* if OK, read new maximum address value */

	if ((tf->status & 0x01) == 0) {

		addr_set = ((tf->device & 0xf) << 24) |

			   (tf->lbah << 16) | (tf->lbam << 8) | tf->lbal;

		addr_set++;

	}

	return addr_set;

}



static unsigned long long idedisk_set_max_address_ext(ide_drive_t *drive, unsigned long long addr_req)

{

	ide_task_t args;

	struct ide_taskfile *tf = &args.tf;

	unsigned long long addr_set = 0;

	u64 addr_set = 0;



	addr_req--;

	/* Create IDE/ATA command request structure */
@@ -401,11 +357,16 @@ static unsigned long long idedisk_set_max_address_ext(ide_drive_t *drive, unsign 
	tf->lbal     = (addr_req >>  0) & 0xff;

	tf->lbam     = (addr_req >>= 8) & 0xff;

	tf->lbah     = (addr_req >>= 8) & 0xff;

	tf->device   = ATA_LBA;

	tf->command  = WIN_SET_MAX_EXT;

	if (lba48) {

		tf->hob_lbal = (addr_req >>= 8) & 0xff;

		tf->hob_lbam = (addr_req >>= 8) & 0xff;

		tf->hob_lbah = (addr_req >>= 8) & 0xff;

		tf->command  = WIN_SET_MAX_EXT;

	} else {

		tf->device   = (addr_req >>= 8) & 0x0f;

		tf->command  = WIN_SET_MAX;

	}

	tf->device |= ATA_LBA;

	args.command_type			= IDE_DRIVE_TASK_NO_DATA;

	args.handler				= &task_no_data_intr;

	/* submit command request */
@@ -414,7 +375,11 @@ static unsigned long long idedisk_set_max_address_ext(ide_drive_t *drive, unsign 
	if ((tf->status & 0x01) == 0) {

		u32 high, low;



		high = (tf->hob_lbah << 16) | (tf->hob_lbam << 8) | tf->hob_lbal;

		if (lba48)

			high = (tf->hob_lbah << 16) | (tf->hob_lbam << 8) |

				tf->hob_lbal;

		else

			high = tf->device & 0xf;

		low  = (tf->lbah << 16) | (tf->lbam << 8) | tf->lbal;

		addr_set = ((__u64)high << 24) | low;

		addr_set++;
@@ -464,10 +429,8 @@ static void idedisk_check_hpa(ide_drive_t *drive) 
	int lba48 = idedisk_supports_lba48(drive->id);



	capacity = drive->capacity64;

	if (lba48)

		set_max = idedisk_read_native_max_address_ext(drive);

	else

		set_max = idedisk_read_native_max_address(drive);



	set_max = idedisk_read_native_max_address(drive, lba48);



	if (ide_in_drive_list(drive->id, hpa_list)) {

		/*
@@ -488,10 +451,8 @@ static void idedisk_check_hpa(ide_drive_t *drive) 
			 capacity, sectors_to_MB(capacity),

			 set_max, sectors_to_MB(set_max));



	if (lba48)

		set_max = idedisk_set_max_address_ext(drive, set_max);

	else

		set_max = idedisk_set_max_address(drive, set_max);

	set_max = idedisk_set_max_address(drive, set_max, lba48);



	if (set_max) {

		drive->capacity64 = set_max;

		printk(KERN_INFO "%s: Host Protected Area disabled.\n",