ata: libata: Print device quirks only once
Damien Le Moal
maintainerPATCH 1/1 ata: libata: Print device quirks only once
In ata_dev_print_quirks(), return early if ata_dev_print_info() returns false or if we already printed quirk information. This is to avoid printing a device quirks multiple times (that is, each time ata_dev_revalidate() is called).
To remember if ata_dev_print_quirks() was already executed, define the EH context flag ATA_EHI_DID_PRINT_QUIRKS and set this flag in ata_dev_print_quirks().
Reported-by Geert Uytterhoeven <[email protected]>
Fixes 58157d607aec ("ata: libata: Print quirks applied to devices")
Signed-off-by Damien Le Moal <[email protected]>
Tested-by Geert Uytterhoeven <[email protected]>
--- drivers/ata/libata-core.c | 8 +++++++- include/linux/libata.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/ata/libata-core.c +7 -1
@@ -160,7 +160,7 @@ MODULE_DESCRIPTION("Library module for ATA devices");MODULE_LICENSE ("GPL" );MODULE_VERSION (DRV_VERSION ); -static inline bool ata_dev_print_info (struct ata_device *dev) +static inline bool ata_dev_print_info (const struct ata_device *dev) {struct ata_eh_context *ehc = &dev->link->eh_context;
@@ -4025,10 +4025,16 @@ static void ata_dev_print_quirks(const struct ata_device *dev, const char *model, const char *rev, unsigned int quirks) { + struct ata_eh_context *ehc = &dev->link->eh_context;int n =0 , i;size_t sz;char *str; +if (!ata_dev_print_info (dev) || ehc->i.flags &ATA_EHI_DID_PRINT_QUIRKS ) +return ; + + ehc->i.flags |=ATA_EHI_DID_PRINT_QUIRKS ; +if (!quirks)return ;
include/linux/libata.h +1 -0
@@ -378,6 +378,7 @@ enum {ATA_EHI_PRINTINFO = (1 <<18 ),/* print configuration info */ ATA_EHI_SETMODE = (1 <<19 ),/* configure transfer mode */ ATA_EHI_POST_SETMODE = (1 <<20 ),/* revalidating after setmode */ +ATA_EHI_DID_PRINT_QUIRKS = (1 <<21 ),/* already printed quirks info */ ATA_EHI_DID_RESET = ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,
Signature · 1 line
2.45.2