From: Tasos Sahanidis <tasos@xxxxxxxxxxxx> [ Upstream commit 33877220b8641b4cde474a4229ea92c0e3637883 ] On at least an ASRock 990FX Extreme 4 with a VIA VT6330, the devices have not yet been enabled by the first time ata_acpi_cbl_80wire() is called. This means that the ata_for_each_dev loop is never entered, and a 40 wire cable is assumed. The VIA controller on this board does not report the cable in the PCI config space, thus having to fall back to ACPI even though no SATA bridge is present. The _GTM values are correctly reported by the firmware through ACPI, which has already set up faster transfer modes, but due to the above the controller is forced down to a maximum of UDMA/33. Resolve this by modifying ata_acpi_cbl_80wire() to directly return the cable type. First, an unknown cable is assumed which preserves the mode set by the firmware, and then on subsequent calls when the devices have been enabled, an 80 wire cable is correctly detected. Since the function now directly returns the cable type, it is renamed to ata_acpi_cbl_pata_type(). Signed-off-by: Tasos Sahanidis <tasos@xxxxxxxxxxxx> Link: https://lore.kernel.org/r/20250519085945.1399466-1-tasos@xxxxxxxxxxxx Signed-off-by: Niklas Cassel <cassel@xxxxxxxxxx> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> --- **YES** This commit should be backported to stable kernel trees. Here's my extensive analysis: ## Bug Fix Analysis This commit fixes a **real hardware initialization bug** that causes significant user-visible problems: 1. **The Bug**: On ASRock 990FX Extreme 4 motherboards with VIA VT6330 controllers, the ATA devices are not yet enabled when `ata_acpi_cbl_80wire()` is first called during initialization. This causes the `ata_for_each_dev` loop to never execute, resulting in the function returning 0 (false), which incorrectly indicates a 40-wire cable. 2. **User Impact**: The incorrect cable detection limits the drive to UDMA/33 (33 MB/s) instead of faster UDMA modes (up to 133 MB/s with UDMA/133), causing a **75% performance degradation** for affected users. ## Code Analysis The fix is elegant and low-risk: ### Original Code Problem: ```c int ata_acpi_cbl_80wire(struct ata_port *ap, const struct ata_acpi_gtm *gtm) { ata_for_each_dev(dev, &ap->link, ENABLED) { // This loop never executes if no devices are enabled yet if (udma_mask & ~ATA_UDMA_MASK_40C) return 1; } return 0; // Always returns "not 80-wire" if no devices enabled } ``` ### The Fix: ```c int ata_acpi_cbl_pata_type(struct ata_port *ap) { int ret = ATA_CBL_PATA_UNK; // Start with "unknown" instead of assuming 40-wire ata_for_each_dev(dev, &ap->link, ENABLED) { ret = ATA_CBL_PATA40; // Only set to 40-wire if we actually check a device if (udma_mask & ~ATA_UDMA_MASK_40C) { ret = ATA_CBL_PATA80; break; } } return ret; } ``` ## Why This Is a Good Backport Candidate 1. **Fixes a real bug**: Not a feature or optimization - addresses incorrect hardware detection 2. **Small, contained change**: Only 3 files modified with minimal code changes 3. **Low regression risk**: - Only affects PATA devices using ACPI cable detection - Preserves all existing functionality - Returns "unknown" when uncertain, which is safer than incorrect detection 4. **Clear problem/solution**: The bug and fix are well-understood and documented 5. **Hardware-specific fix**: Addresses a timing issue on specific hardware that users cannot work around ## Stable Tree Criteria Met This commit meets the stable kernel criteria: - ✓ Fixes a bug that affects users (performance degradation) - ✓ Small change (< 100 lines) - ✓ Obviously correct and tested (preserves firmware settings) - ✓ Fixes a real issue reported by users - ✓ No new features added The commit message clearly documents a specific hardware configuration where this bug occurs, providing good traceability for the fix. drivers/ata/libata-acpi.c | 24 ++++++++++++++++-------- drivers/ata/pata_via.c | 6 ++---- include/linux/libata.h | 7 +++---- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index b7f0bf7955213..f2140fc06ba0f 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c @@ -514,15 +514,19 @@ unsigned int ata_acpi_gtm_xfermask(struct ata_device *dev, EXPORT_SYMBOL_GPL(ata_acpi_gtm_xfermask); /** - * ata_acpi_cbl_80wire - Check for 80 wire cable + * ata_acpi_cbl_pata_type - Return PATA cable type * @ap: Port to check - * @gtm: GTM data to use * - * Return 1 if the @gtm indicates the BIOS selected an 80wire mode. + * Return ATA_CBL_PATA* according to the transfer mode selected by BIOS */ -int ata_acpi_cbl_80wire(struct ata_port *ap, const struct ata_acpi_gtm *gtm) +int ata_acpi_cbl_pata_type(struct ata_port *ap) { struct ata_device *dev; + int ret = ATA_CBL_PATA_UNK; + const struct ata_acpi_gtm *gtm = ata_acpi_init_gtm(ap); + + if (!gtm) + return ATA_CBL_PATA40; ata_for_each_dev(dev, &ap->link, ENABLED) { unsigned int xfer_mask, udma_mask; @@ -530,13 +534,17 @@ int ata_acpi_cbl_80wire(struct ata_port *ap, const struct ata_acpi_gtm *gtm) xfer_mask = ata_acpi_gtm_xfermask(dev, gtm); ata_unpack_xfermask(xfer_mask, NULL, NULL, &udma_mask); - if (udma_mask & ~ATA_UDMA_MASK_40C) - return 1; + ret = ATA_CBL_PATA40; + + if (udma_mask & ~ATA_UDMA_MASK_40C) { + ret = ATA_CBL_PATA80; + break; + } } - return 0; + return ret; } -EXPORT_SYMBOL_GPL(ata_acpi_cbl_80wire); +EXPORT_SYMBOL_GPL(ata_acpi_cbl_pata_type); static void ata_acpi_gtf_to_tf(struct ata_device *dev, const struct ata_acpi_gtf *gtf, diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index 696b99720dcbd..c8acf6511071b 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c @@ -201,11 +201,9 @@ static int via_cable_detect(struct ata_port *ap) { two drives */ if (ata66 & (0x10100000 >> (16 * ap->port_no))) return ATA_CBL_PATA80; + /* Check with ACPI so we can spot BIOS reported SATA bridges */ - if (ata_acpi_init_gtm(ap) && - ata_acpi_cbl_80wire(ap, ata_acpi_init_gtm(ap))) - return ATA_CBL_PATA80; - return ATA_CBL_PATA40; + return ata_acpi_cbl_pata_type(ap); } static int via_pre_reset(struct ata_link *link, unsigned long deadline) diff --git a/include/linux/libata.h b/include/linux/libata.h index e5695998acb02..ec3b0c9c2a8cf 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -1363,7 +1363,7 @@ int ata_acpi_stm(struct ata_port *ap, const struct ata_acpi_gtm *stm); int ata_acpi_gtm(struct ata_port *ap, struct ata_acpi_gtm *stm); unsigned int ata_acpi_gtm_xfermask(struct ata_device *dev, const struct ata_acpi_gtm *gtm); -int ata_acpi_cbl_80wire(struct ata_port *ap, const struct ata_acpi_gtm *gtm); +int ata_acpi_cbl_pata_type(struct ata_port *ap); #else static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap) { @@ -1388,10 +1388,9 @@ static inline unsigned int ata_acpi_gtm_xfermask(struct ata_device *dev, return 0; } -static inline int ata_acpi_cbl_80wire(struct ata_port *ap, - const struct ata_acpi_gtm *gtm) +static inline int ata_acpi_cbl_pata_type(struct ata_port *ap) { - return 0; + return ATA_CBL_PATA40; } #endif -- 2.39.5
