| Message ID | 20240213130733.819524-2-cassel@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | ahci minor quirk cleanups | expand |
On 2/13/24 22:07, Niklas Cassel wrote: > Commit 7edbb6059274 ("ahci: clean up intel_pcs_quirk") added a new board > type (board_ahci_pcs_quirk) which applies the Intel PCS quirk for legacy > platforms. However, it also modified board_ahci_avn and board_ahci_nosntf > to apply the same quirk. > > board_ahci_avn is defined under the label: > /* board IDs for specific chipsets in alphabetical order */ > This is a board for a specific chipset, so the naming is perfectly fine. > (The name does not need to be suffixed with _pcs_quirk, since all > controllers for this chipset require the quirk to be applied). > > board_ahci_nosntf is defined under the label: > /* board IDs by feature in alphabetical order */ > This is a board for a specific feature/quirk. However, it is used to > apply two different quirks. > > Rename board_ahci_nosntf to more clearly highlight that this board ID > applies two different quirks. > > Fixes: 7edbb6059274 ("ahci: clean up intel_pcs_quirk") > Signed-off-by: Niklas Cassel <cassel@kernel.org> > --- > drivers/ata/ahci.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c > index 41b4c9777c85..c28ad3f4b59e 100644 > --- a/drivers/ata/ahci.c > +++ b/drivers/ata/ahci.c > @@ -53,7 +53,7 @@ enum board_ids { > board_ahci_no_debounce_delay, > board_ahci_nomsi, > board_ahci_noncq, > - board_ahci_nosntf, > + board_ahci_nosntf_pcs_quirk, > /* > * board_ahci_pcs_quirk is for legacy Intel platforms. > * Modern Intel platforms should use board_ahci instead. > @@ -165,7 +165,7 @@ static const struct ata_port_info ahci_port_info[] = { > .udma_mask = ATA_UDMA6, > .port_ops = &ahci_ops, > }, > - [board_ahci_nosntf] = { > + [board_ahci_nosntf_pcs_quirk] = { > AHCI_HFLAGS (AHCI_HFLAG_NO_SNTF | > AHCI_HFLAG_INTEL_PCS_QUIRK), > .flags = AHCI_FLAG_COMMON, > @@ -271,7 +271,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { > { PCI_VDEVICE(INTEL, 0x2683), board_ahci_pcs_quirk }, /* ESB2 */ > { PCI_VDEVICE(INTEL, 0x27c6), board_ahci_pcs_quirk }, /* ICH7-M DH */ > { PCI_VDEVICE(INTEL, 0x2821), board_ahci_pcs_quirk }, /* ICH8 */ > - { PCI_VDEVICE(INTEL, 0x2822), board_ahci_nosntf }, /* ICH8/Lewisburg RAID*/ > + { PCI_VDEVICE(INTEL, 0x2822), board_ahci_nosntf_pcs_quirk }, /* ICH8/Lewisburg RAID*/ Minor nit: I would name the board board_ahci_pcs_quirk_nosntf to make it easier to see that this is a sub case of the general board_ahci_pcs_quirk. > { PCI_VDEVICE(INTEL, 0x2824), board_ahci_pcs_quirk }, /* ICH8 */ > { PCI_VDEVICE(INTEL, 0x2829), board_ahci_pcs_quirk }, /* ICH8M */ > { PCI_VDEVICE(INTEL, 0x282a), board_ahci_pcs_quirk }, /* ICH8M */ With that, this look good. Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 41b4c9777c85..c28ad3f4b59e 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -53,7 +53,7 @@ enum board_ids { board_ahci_no_debounce_delay, board_ahci_nomsi, board_ahci_noncq, - board_ahci_nosntf, + board_ahci_nosntf_pcs_quirk, /* * board_ahci_pcs_quirk is for legacy Intel platforms. * Modern Intel platforms should use board_ahci instead. @@ -165,7 +165,7 @@ static const struct ata_port_info ahci_port_info[] = { .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, - [board_ahci_nosntf] = { + [board_ahci_nosntf_pcs_quirk] = { AHCI_HFLAGS (AHCI_HFLAG_NO_SNTF | AHCI_HFLAG_INTEL_PCS_QUIRK), .flags = AHCI_FLAG_COMMON, @@ -271,7 +271,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x2683), board_ahci_pcs_quirk }, /* ESB2 */ { PCI_VDEVICE(INTEL, 0x27c6), board_ahci_pcs_quirk }, /* ICH7-M DH */ { PCI_VDEVICE(INTEL, 0x2821), board_ahci_pcs_quirk }, /* ICH8 */ - { PCI_VDEVICE(INTEL, 0x2822), board_ahci_nosntf }, /* ICH8/Lewisburg RAID*/ + { PCI_VDEVICE(INTEL, 0x2822), board_ahci_nosntf_pcs_quirk }, /* ICH8/Lewisburg RAID*/ { PCI_VDEVICE(INTEL, 0x2824), board_ahci_pcs_quirk }, /* ICH8 */ { PCI_VDEVICE(INTEL, 0x2829), board_ahci_pcs_quirk }, /* ICH8M */ { PCI_VDEVICE(INTEL, 0x282a), board_ahci_pcs_quirk }, /* ICH8M */
Commit 7edbb6059274 ("ahci: clean up intel_pcs_quirk") added a new board type (board_ahci_pcs_quirk) which applies the Intel PCS quirk for legacy platforms. However, it also modified board_ahci_avn and board_ahci_nosntf to apply the same quirk. board_ahci_avn is defined under the label: /* board IDs for specific chipsets in alphabetical order */ This is a board for a specific chipset, so the naming is perfectly fine. (The name does not need to be suffixed with _pcs_quirk, since all controllers for this chipset require the quirk to be applied). board_ahci_nosntf is defined under the label: /* board IDs by feature in alphabetical order */ This is a board for a specific feature/quirk. However, it is used to apply two different quirks. Rename board_ahci_nosntf to more clearly highlight that this board ID applies two different quirks. Fixes: 7edbb6059274 ("ahci: clean up intel_pcs_quirk") Signed-off-by: Niklas Cassel <cassel@kernel.org> --- drivers/ata/ahci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)