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

Commit fa1f82f6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: GKI: scsi: add Android ABI padding to some structures 



Try to mitigate potential future driver core api changes by adding a
padding to struct scsi_cmnd, struct scsi_device, and struct
scsi_host_template.

Based on a change made to the RHEL/CENTOS 8 kernel.

Bug: 151154716
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie6a2b91970e8f9063bf00e96a0dff661f77b8e8d
parent 72857892

include/scsi/scsi_cmnd.h

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/scatterlist.h>

#include <scsi/scsi_device.h>

#include <scsi/scsi_request.h>

#include <linux/android_kabi.h>



struct Scsi_Host;

struct scsi_driver;
@@ -147,6 +148,11 @@ struct scsi_cmnd { 
	int flags;		/* Command flags */



	unsigned char tag;	/* SCSI-II queued command tag */



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

	ANDROID_KABI_RESERVE(3);

	ANDROID_KABI_RESERVE(4);

};



/*

include/scsi/scsi_device.h

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/blkdev.h>

#include <scsi/scsi.h>

#include <linux/atomic.h>

#include <linux/android_kabi.h>



struct device;

struct request_queue;
@@ -232,6 +233,11 @@ struct scsi_device { 
	enum scsi_device_state sdev_state;

	struct task_struct	*quiesced_by;

	unsigned long		sdev_data[0];



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

	ANDROID_KABI_RESERVE(3);

	ANDROID_KABI_RESERVE(4);

} __attribute__((aligned(sizeof(unsigned long))));



#define	to_scsi_device(d)	\

include/scsi/scsi_host.h

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/seq_file.h>

#include <linux/blk-mq.h>

#include <scsi/scsi.h>

#include <linux/android_kabi.h>



struct request_queue;

struct block_device;
@@ -487,6 +488,11 @@ struct scsi_host_template { 


	/* Delay for runtime autosuspend */

	int rpm_autosuspend_delay;



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

	ANDROID_KABI_RESERVE(3);

	ANDROID_KABI_RESERVE(4);

};



/*