Commit 526942b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ATA updates from Damien Le Moal:

 - Some code refactoring for the pata_hpt37x and pata_hpt3x2n drivers,
   from Sergei.

 - Several patches to cleanup in libata-core, libata-scsi and libata-eh
   code: fixes arguments and variables types, change some functions
   declaration to static and fix for a typo in a comment. From Sergey
   and Xiang.

 - Fix a compilation warning in the pata_macio driver, from me.

 - A fix for the expected number of resources in the sata_mv driver fix,
   from Andrew.

* tag 'ata-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: sata_mv: Fixes expected number of resources now IRQs are gone
  ata: libata-scsi: fix result type of ata_ioc32()
  ata: pata_macio: Fix compilation warning
  ata: libata-eh: fix sloppy result type of ata_internal_cmd_timeout()
  ata: libata-core: fix sloppy parameter type in ata_exec_internal[_sg]()
  ata: make ata_port::fastdrain_cnt *unsigned int*
  ata: libata-eh: fix sloppy result type of ata_eh_nr_in_flight()
  ata: libata-core: make ata_exec_internal_sg() *static*
  ata: make transfer mode masks *unsigned int*
  ata: libata-core: get rid of *else* branches in ata_id_n_sectors()
  ata: libata-core: fix sloppy typing in ata_id_n_sectors()
  ata: pata_hpt3x2n: pass base DPLL frequency to hpt3x2n_pci_clock()
  ata: pata_hpt37x: merge hpt374_read_freq() to hpt37x_pci_clock()
  ata: pata_hpt37x: factor out hpt37x_pci_clock()
  ata: pata_hpt37x: move claculating PCI clock from hpt37x_clock_slot()
  ata: libata: Fix syntax errors in comments
parents a39b5dbd b3b2bec9

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

+34 −34
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",
@@ -1103,16 +1103,16 @@ static u64 ata_id_n_sectors(const u16 *id) 
	if (ata_id_has_lba(id)) {

		if (ata_id_has_lba48(id))

			return ata_id_u64(id, ATA_ID_LBA_CAPACITY_2);

		else



		return ata_id_u32(id, ATA_ID_LBA_CAPACITY);

	} else {

		if (ata_id_current_chs_valid(id))

			return id[ATA_ID_CUR_CYLS] * id[ATA_ID_CUR_HEADS] *

			       id[ATA_ID_CUR_SECTORS];

		else

			return id[ATA_ID_CYLS] * id[ATA_ID_HEADS] *

			       id[ATA_ID_SECTORS];

	}



	if (ata_id_current_chs_valid(id))

		return (u32)id[ATA_ID_CUR_CYLS] * (u32)id[ATA_ID_CUR_HEADS] *

		       (u32)id[ATA_ID_CUR_SECTORS];



	return (u32)id[ATA_ID_CYLS] * (u32)id[ATA_ID_HEADS] *

	       (u32)id[ATA_ID_SECTORS];

}



u64 ata_tf_to_lba48(const struct ata_taskfile *tf)
@@ -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)) {
@@ -1467,10 +1467,10 @@ static void ata_qc_complete_internal(struct ata_queued_cmd *qc) 
 *	RETURNS:

 *	Zero on success, AC_ERR_* mask on failure

 */

unsigned ata_exec_internal_sg(struct ata_device *dev,

static unsigned ata_exec_internal_sg(struct ata_device *dev,

				     struct ata_taskfile *tf, const u8 *cdb,

				     int dma_dir, struct scatterlist *sgl,

			      unsigned int n_elem, unsigned long timeout)

				     unsigned int n_elem, unsigned int timeout)

{

	struct ata_link *link = dev->link;

	struct ata_port *ap = link->ap;
@@ -1645,7 +1645,7 @@ unsigned ata_exec_internal_sg(struct ata_device *dev, 
unsigned ata_exec_internal(struct ata_device *dev,

			   struct ata_taskfile *tf, const u8 *cdb,

			   int dma_dir, void *buf, unsigned int buflen,

			   unsigned long timeout)

			   unsigned int timeout)

{

	struct scatterlist *psg = NULL, sg;

	unsigned int n_elem = 0;
@@ -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,
@@ -4342,7 +4342,7 @@ unsigned int ata_dev_set_feature(struct ata_device *dev, u8 enable, u8 feature) 
{

	struct ata_taskfile tf;

	unsigned int err_mask;

	unsigned long timeout = 0;

	unsigned int timeout = 0;



	/* set up set-features taskfile */

	ata_dev_dbg(dev, "set features - SATA features\n");
@@ -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/libata-eh.c

+15 −15
Original line number Diff line number Diff line
@@ -86,36 +86,36 @@ static const unsigned long ata_eh_reset_timeouts[] = { 
	ULONG_MAX, /* > 1 min has elapsed, give up */

};



static const unsigned long ata_eh_identify_timeouts[] = {

static const unsigned int ata_eh_identify_timeouts[] = {

	 5000,	/* covers > 99% of successes and not too boring on failures */

	10000,  /* combined time till here is enough even for media access */

	30000,	/* for true idiots */

	ULONG_MAX,

	UINT_MAX,

};



static const unsigned long ata_eh_revalidate_timeouts[] = {

static const unsigned int ata_eh_revalidate_timeouts[] = {

	15000,	/* Some drives are slow to read log pages when waking-up */

	15000,  /* combined time till here is enough even for media access */

	ULONG_MAX,

	UINT_MAX,

};



static const unsigned long ata_eh_flush_timeouts[] = {

static const unsigned int ata_eh_flush_timeouts[] = {

	15000,	/* be generous with flush */

	15000,  /* ditto */

	30000,	/* and even more generous */

	ULONG_MAX,

	UINT_MAX,

};



static const unsigned long ata_eh_other_timeouts[] = {

static const unsigned int ata_eh_other_timeouts[] = {

	 5000,	/* same rationale as identify timeout */

	10000,	/* ditto */

	/* but no merciful 30sec for other commands, it just isn't worth it */

	ULONG_MAX,

	UINT_MAX,

};



struct ata_eh_cmd_timeout_ent {

	const u8		*commands;

	const unsigned long	*timeouts;

	const unsigned int	*timeouts;

};



/* The following table determines timeouts to use for EH internal
@@ -326,7 +326,7 @@ static int ata_lookup_timeout_table(u8 cmd) 
 *	RETURNS:

 *	Determined timeout.

 */

unsigned long ata_internal_cmd_timeout(struct ata_device *dev, u8 cmd)

unsigned int ata_internal_cmd_timeout(struct ata_device *dev, u8 cmd)

{

	struct ata_eh_context *ehc = &dev->link->eh_context;

	int ent = ata_lookup_timeout_table(cmd);
@@ -361,7 +361,7 @@ void ata_internal_cmd_timed_out(struct ata_device *dev, u8 cmd) 
		return;



	idx = ehc->cmd_timeout_idx[dev->devno][ent];

	if (ata_eh_cmd_timeout_table[ent].timeouts[idx + 1] != ULONG_MAX)

	if (ata_eh_cmd_timeout_table[ent].timeouts[idx + 1] != UINT_MAX)

		ehc->cmd_timeout_idx[dev->devno][ent]++;

}
@@ -802,11 +802,11 @@ void ata_port_wait_eh(struct ata_port *ap) 
}

EXPORT_SYMBOL_GPL(ata_port_wait_eh);



static int ata_eh_nr_in_flight(struct ata_port *ap)

static unsigned int ata_eh_nr_in_flight(struct ata_port *ap)

{

	struct ata_queued_cmd *qc;

	unsigned int tag;

	int nr = 0;

	unsigned int nr = 0;



	/* count only non-internal commands */

	ata_qc_for_each(ap, qc, tag) {
@@ -821,7 +821,7 @@ void ata_eh_fastdrain_timerfn(struct timer_list *t) 
{

	struct ata_port *ap = from_timer(ap, t, fastdrain_timer);

	unsigned long flags;

	int cnt;

	unsigned int cnt;



	spin_lock_irqsave(ap->lock, flags);
@@ -870,7 +870,7 @@ void ata_eh_fastdrain_timerfn(struct timer_list *t) 
 */

static void ata_eh_set_pending(struct ata_port *ap, int fastdrain)

{

	int cnt;

	unsigned int cnt;



	/* already scheduled? */

	if (ap->pflags & ATA_PFLAG_EH_PENDING)

drivers/ata/libata-scsi.c

+4 −4
Original line number Diff line number Diff line
@@ -539,13 +539,13 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) 
	return rc;

}



static int ata_ioc32(struct ata_port *ap)

static bool ata_ioc32(struct ata_port *ap)

{

	if (ap->flags & ATA_FLAG_PIO_DMA)

		return 1;

		return true;

	if (ap->pflags & ATA_PFLAG_PIO32)

		return 1;

	return 0;

		return true;

	return false;

}



/*

drivers/ata/libata-transport.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * and various sysfs attributes to expose these topologies and management

 * interfaces to user-space.

 *

 * There are 3 objects defined in in this class:

 * There are 3 objects defined in this class:

 * - ata_port

 * - ata_link

 * - ata_device