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

Commit 38150f7a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Martin K. Petersen
Browse files

scsi: aacraid: stop using deprated get_seconds() 



get_seconds() can overflow on 32-bit architectures and is deprecated
because of that. The use in the aacraid driver has the same problem due to
a limited firmware interface, it also overflows in the year 2106.

This changes all calls to get_seconds() to the non-deprecated
ktime_get_real_seconds(), which unfortunately doesn't solve that problem
but gets rid of one user of the deprecated interface.

[mkp: checkpatch]

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a38b80c5

drivers/scsi/aacraid/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static void aac_rx_start_adapter(struct aac_dev *dev) 
	union aac_init *init;



	init = dev->init;

	init->r7.host_elapsed_seconds = cpu_to_le32(get_seconds());

	init->r7.host_elapsed_seconds = cpu_to_le32(ktime_get_real_seconds());

	// We can only use a 32 bit address here

	rx_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, (u32)(ulong)dev->init_pa,

	  0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);

drivers/scsi/aacraid/sa.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void aac_sa_start_adapter(struct aac_dev *dev) 
	 * Fill in the remaining pieces of the init.

	 */

	init = dev->init;

	init->r7.host_elapsed_seconds = cpu_to_le32(get_seconds());

	init->r7.host_elapsed_seconds = cpu_to_le32(ktime_get_real_seconds());

	/* We can only use a 32 bit address here */

	sa_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, 

			(u32)(ulong)dev->init_pa, 0, 0, 0, 0, 0,

drivers/scsi/aacraid/src.c

+4 −2
Original line number Diff line number Diff line
@@ -409,7 +409,8 @@ static void aac_src_start_adapter(struct aac_dev *dev) 


	init = dev->init;

	if (dev->comm_interface == AAC_COMM_MESSAGE_TYPE3) {

		init->r8.host_elapsed_seconds = cpu_to_le32(get_seconds());

		init->r8.host_elapsed_seconds =

			cpu_to_le32(ktime_get_real_seconds());

		src_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS,

			lower_32_bits(dev->init_pa),

			upper_32_bits(dev->init_pa),
@@ -417,7 +418,8 @@ static void aac_src_start_adapter(struct aac_dev *dev) 
			(AAC_MAX_HRRQ - 1) * sizeof(struct _rrq),

			0, 0, 0, NULL, NULL, NULL, NULL, NULL);

	} else {

		init->r7.host_elapsed_seconds = cpu_to_le32(get_seconds());

		init->r7.host_elapsed_seconds =

			cpu_to_le32(ktime_get_real_seconds());

		// We can only use a 32 bit address here

		src_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS,

			(u32)(ulong)dev->init_pa, 0, 0, 0, 0, 0,