| Message ID | 20220407123748.1170212-4-damien.lemoal@opensource.wdc.com |
|---|---|
| State | New |
| Headers | show |
| Series | libata.force improvements | expand |
On 4/7/22 3:37 PM, Damien Le Moal wrote: > Similarly to the horkage flags, introduce the force_lflag_onoff() macro > to define struct ata_force_param entries of the force_tbl array that > allow turning on or off a link flag using the libata.force boot > parameter. Using this new helper macro, define a new force_tbl entry > for the ATA_LFLAG_NO_DEBOUNCE_DELAY link flag, thus allowing testing if > an adapter requires a link debounce delay or not. > > Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> > --- > drivers/ata/libata-core.c | 22 +++++++++++++++++----- > 1 file changed, 17 insertions(+), 5 deletions(-) > > diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c > index c0cf42ffcc38..75856f4210d7 100644 > --- a/drivers/ata/libata-core.c > +++ b/drivers/ata/libata-core.c [...] > @@ -6154,7 +6161,11 @@ EXPORT_SYMBOL_GPL(ata_platform_remove_one); > { # mode, .xfer_mask = (1UL << (shift)) } > > #define force_lflag_on(name, flags) \ > - { # name, .lflags = (flags) } > + { # name, .lflags_on = (flags) } The same comment about #name... > + > +#define force_lflag_onoff(name, flags) \ > + { "no" # name, .lflags_on = (flags) }, \ > + { # name, .lflags_off = (flags) } > > #define force_horkage_on(name, flag) \ > { # name, .horkage_on = (flag) } [...] Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru> MBR, Sergey
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index c0cf42ffcc38..75856f4210d7 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -96,7 +96,8 @@ struct ata_force_param { unsigned long xfer_mask; unsigned int horkage_on; unsigned int horkage_off; - u16 lflags; + u16 lflags_on; + u16 lflags_off; }; struct ata_force_ent { @@ -386,11 +387,17 @@ static void ata_force_link_limits(struct ata_link *link) } /* let lflags stack */ - if (fe->param.lflags) { - link->flags |= fe->param.lflags; + if (fe->param.lflags_on) { + link->flags |= fe->param.lflags_on; ata_link_notice(link, "FORCE: link flag 0x%x forced -> 0x%x\n", - fe->param.lflags, link->flags); + fe->param.lflags_on, link->flags); + } + if (fe->param.lflags_off) { + link->flags &= ~fe->param.lflags_off; + ata_link_notice(link, + "FORCE: link flag 0x%x cleared -> 0x%x\n", + fe->param.lflags_off, link->flags); } } } @@ -6154,7 +6161,11 @@ EXPORT_SYMBOL_GPL(ata_platform_remove_one); { # mode, .xfer_mask = (1UL << (shift)) } #define force_lflag_on(name, flags) \ - { # name, .lflags = (flags) } + { # name, .lflags_on = (flags) } + +#define force_lflag_onoff(name, flags) \ + { "no" # name, .lflags_on = (flags) }, \ + { # name, .lflags_off = (flags) } #define force_horkage_on(name, flag) \ { # name, .horkage_on = (flag) } @@ -6213,6 +6224,7 @@ static const struct ata_force_param force_tbl[] __initconst = { force_lflag_on(nosrst, ATA_LFLAG_NO_SRST), force_lflag_on(norst, ATA_LFLAG_NO_HRST | ATA_LFLAG_NO_SRST), force_lflag_on(rstonce, ATA_LFLAG_RST_ONCE), + force_lflag_onoff(dbdelay, ATA_LFLAG_NO_DEBOUNCE_DELAY), force_horkage_onoff(ncq, ATA_HORKAGE_NONCQ), force_horkage_onoff(ncqtrim, ATA_HORKAGE_NO_NCQ_TRIM),
Similarly to the horkage flags, introduce the force_lflag_onoff() macro to define struct ata_force_param entries of the force_tbl array that allow turning on or off a link flag using the libata.force boot parameter. Using this new helper macro, define a new force_tbl entry for the ATA_LFLAG_NO_DEBOUNCE_DELAY link flag, thus allowing testing if an adapter requires a link debounce delay or not. Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> --- drivers/ata/libata-core.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)