Commit cb6b2897 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libata-5.10-2020-10-24' of git://git.kernel.dk/linux-block 

Pull libata fixes from Jens Axboe:
 "Two minor libata fixes:

   - Fix a DMA boundary mask regression for sata_rcar (Geert)

   - kerneldoc markup fix (Mauro)"

* tag 'libata-5.10-2020-10-24' of git://git.kernel.dk/linux-block:
  ata: fix some kernel-doc markups
  ata: sata_rcar: Fix DMA boundary mask
parents 0eac1102 94bd5719

drivers/ata/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -5616,7 +5616,7 @@ int ata_host_start(struct ata_host *host) 
EXPORT_SYMBOL_GPL(ata_host_start);



/**

 *	ata_sas_host_init - Initialize a host struct for sas (ipr, libsas)

 *	ata_host_init - Initialize a host struct for sas (ipr, libsas)

 *	@host:	host to initialize

 *	@dev:	device host is attached to

 *	@ops:	port_ops

drivers/ata/libata-eh.c

+1 −1
Original line number Diff line number Diff line
@@ -1115,7 +1115,7 @@ void ata_eh_freeze_port(struct ata_port *ap) 
EXPORT_SYMBOL_GPL(ata_eh_freeze_port);



/**

 *	ata_port_thaw_port - EH helper to thaw port

 *	ata_eh_thaw_port - EH helper to thaw port

 *	@ap: ATA port to thaw

 *

 *	Thaw frozen port @ap.

drivers/ata/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ void ata_scsi_sdev_config(struct scsi_device *sdev) 
}



/**

 *	atapi_drain_needed - Check whether data transfer may overflow

 *	ata_scsi_dma_need_drain - Check whether data transfer may overflow

 *	@rq: request to be checked

 *

 *	ATAPI commands which transfer variable length data to host

drivers/ata/sata_rcar.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ 
/* Descriptor table word 0 bit (when DTA32M = 1) */

#define SATA_RCAR_DTEND			BIT(0)



#define SATA_RCAR_DMA_BOUNDARY		0x1FFFFFFEUL

#define SATA_RCAR_DMA_BOUNDARY		0x1FFFFFFFUL



/* Gen2 Physical Layer Control Registers */

#define RCAR_GEN2_PHY_CTL1_REG		0x1704

CRA Git | Maintained and supported by SUSTech CRA and CCSE