Skip to content

Commit 494a2c2

Browse files
committed
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
2 parents 07cd9ac + ac9f0c8 commit 494a2c2

File tree

3 files changed

+25
-0
lines changed

3 files changed

+25
-0
lines changed

MAINTAINERS

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10879,6 +10879,12 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
1087910879
F: drivers/ata/pata_arasan_cf.c
1088010880
F: include/linux/pata_arasan_cf_data.h
1088110881

10882+
LIBATA PATA DRIVERS
10883+
R: Sergey Shtylyov <s.shtylyov@omp.ru>
10884+
L: linux-ide@vger.kernel.org
10885+
F: drivers/ata/ata_*.c
10886+
F: drivers/ata/pata_*.c
10887+
1088210888
LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
1088310889
M: Linus Walleij <linus.walleij@linaro.org>
1088410890
L: linux-ide@vger.kernel.org
@@ -16468,6 +16474,14 @@ F: Documentation/devicetree/bindings/i2c/renesas,rmobile-iic.yaml
1646816474
F: drivers/i2c/busses/i2c-rcar.c
1646916475
F: drivers/i2c/busses/i2c-sh_mobile.c
1647016476

16477+
RENESAS R-CAR SATA DRIVER
16478+
R: Sergey Shtylyov <s.shtylyov@omp.ru>
16479+
S: Supported
16480+
L: linux-ide@vger.kernel.org
16481+
L: linux-renesas-soc@vger.kernel.org
16482+
F: Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
16483+
F: drivers/ata/sata_rcar.c
16484+
1647116485
RENESAS R-CAR THERMAL DRIVERS
1647216486
M: Niklas Söderlund <niklas.soderlund@ragnatech.se>
1647316487
L: linux-renesas-soc@vger.kernel.org

drivers/ata/libata-core.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,6 +2007,9 @@ static bool ata_log_supported(struct ata_device *dev, u8 log)
20072007
{
20082008
struct ata_port *ap = dev->link->ap;
20092009

2010+
if (dev->horkage & ATA_HORKAGE_NO_LOG_DIR)
2011+
return false;
2012+
20102013
if (ata_read_log_page(dev, ATA_LOG_DIRECTORY, 0, ap->sector_buf, 1))
20112014
return false;
20122015
return get_unaligned_le16(&ap->sector_buf[log * 2]) ? true : false;
@@ -4073,6 +4076,13 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
40734076
{ "WDC WD3000JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM },
40744077
{ "WDC WD3200JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM },
40754078

4079+
/*
4080+
* This sata dom device goes on a walkabout when the ATA_LOG_DIRECTORY
4081+
* log page is accessed. Ensure we never ask for this log page with
4082+
* these devices.
4083+
*/
4084+
{ "SATADOM-ML 3ME", NULL, ATA_HORKAGE_NO_LOG_DIR },
4085+
40764086
/* End Marker */
40774087
{ }
40784088
};

include/linux/libata.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ enum {
380380
ATA_HORKAGE_MAX_TRIM_128M = (1 << 26), /* Limit max trim size to 128M */
381381
ATA_HORKAGE_NO_NCQ_ON_ATI = (1 << 27), /* Disable NCQ on ATI chipset */
382382
ATA_HORKAGE_NO_ID_DEV_LOG = (1 << 28), /* Identify device log missing */
383+
ATA_HORKAGE_NO_LOG_DIR = (1 << 29), /* Do not read log directory */
383384

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

0 commit comments

Comments
 (0)