Commit f0a6d77b authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Damien Le Moal
Browse files

ata: make transfer mode masks *unsigned int* 



The packed transfer mode masks and also the {pio|mwdma|udma}_mask fields
of *struct*s ata_device and ata_port_info are declared as *unsigned long*
(which is a 64-bit type on 64-bit architectures) but actually the packed
masks occupy only 20 bits (7 PIO modes, 5 MWDMA modes, and 8 UDMA modes)
and the PIO/MWDMA/UDMA masks easily fit into just 8 bits each, so we can
safely use (always 32-bit) *unsigned int* variables instead.  This saves
745 bytes of object code in libata-core.o alone, not to mention LLDDs...

Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 5eb8deb4

drivers/ata/libata-acpi.c

+4 −4
Original line number Diff line number Diff line
@@ -480,10 +480,10 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) 
 * RETURNS:

 * Determined xfermask.

 */

unsigned long ata_acpi_gtm_xfermask(struct ata_device *dev,

unsigned int ata_acpi_gtm_xfermask(struct ata_device *dev,

				   const struct ata_acpi_gtm *gtm)

{

	unsigned long xfer_mask = 0;

	unsigned int xfer_mask = 0;

	unsigned int type;

	int unit;

	u8 mode;
@@ -525,7 +525,7 @@ int ata_acpi_cbl_80wire(struct ata_port *ap, const struct ata_acpi_gtm *gtm) 
	struct ata_device *dev;



	ata_for_each_dev(dev, &ap->link, ENABLED) {

		unsigned long xfer_mask, udma_mask;

		unsigned int xfer_mask, udma_mask;



		xfer_mask = ata_acpi_gtm_xfermask(dev, gtm);

		ata_unpack_xfermask(xfer_mask, NULL, NULL, &udma_mask);

drivers/ata/libata-core.c

+19 −19
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ struct ata_force_param { 
	const char	*name;

	u8		cbl;

	u8		spd_limit;

	unsigned long	xfer_mask;

	unsigned int	xfer_mask;

	unsigned int	horkage_on;

	unsigned int	horkage_off;

	u16		lflags_on;
@@ -425,7 +425,7 @@ static void ata_force_xfermask(struct ata_device *dev) 


	for (i = ata_force_tbl_size - 1; i >= 0; i--) {

		const struct ata_force_ent *fe = &ata_force_tbl[i];

		unsigned long pio_mask, mwdma_mask, udma_mask;

		unsigned int pio_mask, mwdma_mask, udma_mask;



		if (fe->port != -1 && fe->port != dev->link->ap->print_id)

			continue;
@@ -803,9 +803,9 @@ int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, 
 *	RETURNS:

 *	Packed xfer_mask.

 */

unsigned long ata_pack_xfermask(unsigned long pio_mask,

				unsigned long mwdma_mask,

				unsigned long udma_mask)

unsigned int ata_pack_xfermask(unsigned int pio_mask,

			       unsigned int mwdma_mask,

			       unsigned int udma_mask)

{

	return	((pio_mask << ATA_SHIFT_PIO) & ATA_MASK_PIO) |

		((mwdma_mask << ATA_SHIFT_MWDMA) & ATA_MASK_MWDMA) |
@@ -823,8 +823,8 @@ EXPORT_SYMBOL_GPL(ata_pack_xfermask); 
 *	Unpack @xfer_mask into @pio_mask, @mwdma_mask and @udma_mask.

 *	Any NULL destination masks will be ignored.

 */

void ata_unpack_xfermask(unsigned long xfer_mask, unsigned long *pio_mask,

			 unsigned long *mwdma_mask, unsigned long *udma_mask)

void ata_unpack_xfermask(unsigned int xfer_mask, unsigned int *pio_mask,

			 unsigned int *mwdma_mask, unsigned int *udma_mask)

{

	if (pio_mask)

		*pio_mask = (xfer_mask & ATA_MASK_PIO) >> ATA_SHIFT_PIO;
@@ -857,7 +857,7 @@ static const struct ata_xfer_ent { 
 *	RETURNS:

 *	Matching XFER_* value, 0xff if no match found.

 */

u8 ata_xfer_mask2mode(unsigned long xfer_mask)

u8 ata_xfer_mask2mode(unsigned int xfer_mask)

{

	int highbit = fls(xfer_mask) - 1;

	const struct ata_xfer_ent *ent;
@@ -881,7 +881,7 @@ EXPORT_SYMBOL_GPL(ata_xfer_mask2mode); 
 *	RETURNS:

 *	Matching xfer_mask, 0 if no match found.

 */

unsigned long ata_xfer_mode2mask(u8 xfer_mode)

unsigned int ata_xfer_mode2mask(u8 xfer_mode)

{

	const struct ata_xfer_ent *ent;
@@ -930,7 +930,7 @@ EXPORT_SYMBOL_GPL(ata_xfer_mode2shift); 
 *	Constant C string representing highest speed listed in

 *	@mode_mask, or the constant C string "<n/a>".

 */

const char *ata_mode_string(unsigned long xfer_mask)

const char *ata_mode_string(unsigned int xfer_mask)

{

	static const char * const xfer_mode_str[] = {

		"PIO0",
@@ -1383,9 +1383,9 @@ static inline void ata_dump_id(struct ata_device *dev, const u16 *id) 
 *	RETURNS:

 *	Computed xfermask

 */

unsigned long ata_id_xfermask(const u16 *id)

unsigned int ata_id_xfermask(const u16 *id)

{

	unsigned long pio_mask, mwdma_mask, udma_mask;

	unsigned int pio_mask, mwdma_mask, udma_mask;



	/* Usual case. Word 53 indicates word 64 is valid */

	if (id[ATA_ID_FIELD_VALID] & (1 << 1)) {
@@ -2534,7 +2534,7 @@ int ata_dev_configure(struct ata_device *dev) 
	struct ata_port *ap = dev->link->ap;

	bool print_info = ata_dev_print_info(dev);

	const u16 *id = dev->id;

	unsigned long xfer_mask;

	unsigned int xfer_mask;

	unsigned int err_mask;

	char revbuf[7];		/* XYZ-99\0 */

	char fwrevbuf[ATA_ID_FW_REV_LEN+1];
@@ -3202,8 +3202,8 @@ u8 ata_timing_cycle2mode(unsigned int xfer_shift, int cycle) 
int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel)

{

	char buf[32];

	unsigned long orig_mask, xfer_mask;

	unsigned long pio_mask, mwdma_mask, udma_mask;

	unsigned int orig_mask, xfer_mask;

	unsigned int pio_mask, mwdma_mask, udma_mask;

	int quiet, highbit;



	quiet = !!(sel & ATA_DNXFER_QUIET);
@@ -3381,7 +3381,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev) 


	/* step 1: calculate xfer_mask */

	ata_for_each_dev(dev, link, ENABLED) {

		unsigned long pio_mask, dma_mask;

		unsigned int pio_mask, dma_mask;

		unsigned int mode_mask;



		mode_mask = ATA_DMA_MASK_ATA;
@@ -4217,7 +4217,7 @@ static void ata_dev_xfermask(struct ata_device *dev) 
	struct ata_link *link = dev->link;

	struct ata_port *ap = link->ap;

	struct ata_host *host = ap->host;

	unsigned long xfer_mask;

	unsigned int xfer_mask;



	/* controller modes available */

	xfer_mask = ata_pack_xfermask(ap->pio_mask,
@@ -5776,7 +5776,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) 
	/* set cable, sata_spd_limit and report */

	for (i = 0; i < host->n_ports; i++) {

		struct ata_port *ap = host->ports[i];

		unsigned long xfer_mask;

		unsigned int xfer_mask;



		/* set SATA cable type if still unset */

		if (ap->cbl == ATA_CBL_NONE && (ap->flags & ATA_FLAG_SATA))

drivers/ata/pata_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static unsigned long pacpi_discover_modes(struct ata_port *ap, struct ata_device 
 *	this case the list of discovered valid modes obtained by ACPI probing

 */



static unsigned long pacpi_mode_filter(struct ata_device *adev, unsigned long mask)

static unsigned int pacpi_mode_filter(struct ata_device *adev, unsigned int mask)

{

	struct pata_acpi *acpi = adev->link->ap->private_data;

	return mask & acpi->mask[adev->devno];

drivers/ata/pata_ali.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int ali_c2_cable_detect(struct ata_port *ap) 
 *	fix that later on. Also ensure we do not do UDMA on WDC drives

 */



static unsigned long ali_20_filter(struct ata_device *adev, unsigned long mask)

static unsigned int ali_20_filter(struct ata_device *adev, unsigned int mask)

{

	char model_num[ATA_ID_PROD_LEN + 1];

	/* No DMA on anything but a disk for now */

drivers/ata/pata_amd.c

+7 −7
Original line number Diff line number Diff line
@@ -264,8 +264,8 @@ static void amd133_set_dmamode(struct ata_port *ap, struct ata_device *adev) 
 * cached during driver attach and are consulted to select transfer

 * mode.

 */

static unsigned long nv_mode_filter(struct ata_device *dev,

				    unsigned long xfer_mask)

static unsigned int nv_mode_filter(struct ata_device *dev,

				   unsigned int xfer_mask)

{

	static const unsigned int udma_mask_map[] =

		{ ATA_UDMA2, ATA_UDMA1, ATA_UDMA0, 0,
@@ -274,7 +274,7 @@ static unsigned long nv_mode_filter(struct ata_device *dev, 
	char acpi_str[32] = "";

	u32 saved_udma, udma;

	const struct ata_acpi_gtm *gtm;

	unsigned long bios_limit = 0, acpi_limit = 0, limit;

	unsigned int bios_limit = 0, acpi_limit = 0, limit;



	/* find out what BIOS configured */

	udma = saved_udma = (unsigned long)ap->host->private_data;
@@ -310,8 +310,8 @@ static unsigned long nv_mode_filter(struct ata_device *dev, 
	   cable detection result */

	limit |= ata_pack_xfermask(ATA_PIO4, ATA_MWDMA2, ATA_UDMA2);



	ata_port_dbg(ap, "nv_mode_filter: 0x%lx&0x%lx->0x%lx, "

			"BIOS=0x%lx (0x%x) ACPI=0x%lx%s\n",

	ata_port_dbg(ap,

		     "nv_mode_filter: 0x%x&0x%x->0x%x, BIOS=0x%x (0x%x) ACPI=0x%x%s\n",

		     xfer_mask, limit, xfer_mask & limit, bios_limit,

		     saved_udma, acpi_limit, acpi_str);