Commit 494a2c2b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ATA fixes from Damien Le Moal:

 - Sergey volunteered to be a reviewer for the Renesas R-Car SATA driver
   and PATA drivers. Update the MAINTAINERS file accordingly.

 - Regression fix: add a horkage flag to prevent accessing the log
   directory log page with SATADOM-ML 3ME SATA devices as they react
   badly to reading that log page (from Anton).

* tag 'ata-5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: libata-core: Introduce ATA_HORKAGE_NO_LOG_DIR horkage
  MAINTAINERS: add myself as Renesas R-Car SATA driver reviewer
  MAINTAINERS: add myself as PATA drivers reviewer
parents 07cd9ac4 ac9f0c81

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -10879,6 +10879,12 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git 
F:	drivers/ata/pata_arasan_cf.c

F:	include/linux/pata_arasan_cf_data.h









LIBATA PATA DRIVERS









R:	Sergey Shtylyov <s.shtylyov@omp.ru>









L:	linux-ide@vger.kernel.org









F:	drivers/ata/ata_*.c









F:	drivers/ata/pata_*.c

















LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS









M:	Linus Walleij <linus.walleij@linaro.org>









L:	linux-ide@vger.kernel.org








@@ -16468,6 +16474,14 @@ F:	Documentation/devicetree/bindings/i2c/renesas,rmobile-iic.yaml







F:	drivers/i2c/busses/i2c-rcar.c









F:	drivers/i2c/busses/i2c-sh_mobile.c

















RENESAS R-CAR SATA DRIVER









R:	Sergey Shtylyov <s.shtylyov@omp.ru>









S:	Supported









L:	linux-ide@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









F:	Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml









F:	drivers/ata/sata_rcar.c

















RENESAS R-CAR THERMAL DRIVERS









M:	Niklas Söderlund <niklas.soderlund@ragnatech.se>









L:	linux-renesas-soc@vger.kernel.org
































drivers/ata/libata-core.c



+10
−0






























Original line number
Diff line number
Diff line







@@ -2007,6 +2007,9 @@ static bool ata_log_supported(struct ata_device *dev, u8 log)







{









	struct ata_port *ap = dev->link->ap;



















	if (dev->horkage & ATA_HORKAGE_NO_LOG_DIR)









		return false;



















	if (ata_read_log_page(dev, ATA_LOG_DIRECTORY, 0, ap->sector_buf, 1))









		return false;









	return get_unaligned_le16(&ap->sector_buf[log * 2]) ? true : false;








@@ -4073,6 +4076,13 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {







	{ "WDC WD3000JD-*",		NULL,	ATA_HORKAGE_WD_BROKEN_LPM },









	{ "WDC WD3200JD-*",		NULL,	ATA_HORKAGE_WD_BROKEN_LPM },



















	/*









	 * This sata dom device goes on a walkabout when the ATA_LOG_DIRECTORY









	 * log page is accessed. Ensure we never ask for this log page with









	 * these devices.









	 */









	{ "SATADOM-ML 3ME",		NULL,	ATA_HORKAGE_NO_LOG_DIR },



















	/* End Marker */









	{ }









};
































include/linux/libata.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -380,6 +380,7 @@ enum {







	ATA_HORKAGE_MAX_TRIM_128M = (1 << 26),	/* Limit max trim size to 128M */









	ATA_HORKAGE_NO_NCQ_ON_ATI = (1 << 27),	/* Disable NCQ on ATI chipset */









	ATA_HORKAGE_NO_ID_DEV_LOG = (1 << 28),	/* Identify device log missing */









	ATA_HORKAGE_NO_LOG_DIR	= (1 << 29),	/* Do not read log directory */



















	 /* DMA mask for user DMA control: User visible values; DO NOT









	    renumber */