| Message ID | ZbjgTmR5FbAnb-Ua@wantstofly.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-44536-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id
gs7csp1154568dyb;
Tue, 30 Jan 2024 03:41:50 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IEKP3nUC+c0Qy/GhXg1SjmfZ9h/rsH8KZ6zq+rgNneSgVRCBYFZMpG+ZHIy0WlHIZbqB+/u
X-Received: by 2002:a05:6214:21ea:b0:68c:645d:1a1b with SMTP id
p10-20020a05621421ea00b0068c645d1a1bmr533591qvj.116.1706614910791;
Tue, 30 Jan 2024 03:41:50 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1706614910; cv=pass;
d=google.com; s=arc-20160816;
b=D0QBRcoXEYWTZlLCjZWfwf87CnqSUlGp6idlgV81xdrAVOLg2FVkzSxda0pa7GPvum
Tn1fs+gVAd/YI4sh3dWYS/j52HnWw1BG5+GhRq507tv8B/3PA0Ky06IhDKh6Ey1N63yU
yWXmMXCQq/DG0HzRmkkkKj1UQ0Y5QZn+OOYB/vMCf38EPNHcjcQi+rYnnSGFMOlQG5wT
wN3VL7dVbcyDePUvEz5NvGPLDIUmP5xBZGxi5uQELADEpmPfXRlWE8DsnXci+pfpdi7V
QBtwzRX6CNRF2/kY7/ppwdCQ/ynv80IwVLfr00JSdt6Nqq8AUeBDlNyimuDt4yImU0Qa
BbZw==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=content-disposition:mime-version:list-unsubscribe:list-subscribe
:list-id:precedence:message-id:subject:cc:to:from:date;
bh=LRWZK42gHKRsNFaaqmI6FzwwNatiECWE8PGC/RlRqC4=;
fh=jS+JFZCuoDLBT9WloK/QEqobe/lWMBymEk/kQD6Fh7w=;
b=ypiUZxtppJltvHa4msP4fRQVr+KbfLBKSQ0Hq72NrMtFqpla+TqoQdmE774BiHUGP2
Bn8RgdDrWpuumD0omJ3hEsobzq8ti2zNCdUYBIQEHfWCdiz2NgiiBvHSih6anG7RT9bF
rMqMACfvre0YyRKTaTixtmaHOaFdB0C3vBJE8Ht2leSZfzVu6Y69KXanl6Vp/QpUxGtS
GJJMfMVpmdyzY6NwXeesPeeJjHGVA28ba0B1yxFBaRtWneT3VekItSycPkeD26eEuYHB
FxxTBnEXC+7tCd0357Iuqe3L+If87eyXG4Y9epsHUc2/TfncmlENx6kW+K/44QoYeiuZ
dzJQ==
ARC-Authentication-Results: i=2; mx.google.com;
arc=pass (i=1 spf=pass spfdomain=wantstofly.org);
spf=pass (google.com: domain of
linux-kernel+bounces-44536-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.199.223 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-44536-ouuuleilei=gmail.com@vger.kernel.org"
Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223])
by mx.google.com with ESMTPS id
jq8-20020ad45fc8000000b006861cd0d440si9817060qvb.528.2024.01.30.03.41.50
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 30 Jan 2024 03:41:50 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-44536-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Authentication-Results: mx.google.com;
arc=pass (i=1 spf=pass spfdomain=wantstofly.org);
spf=pass (google.com: domain of
linux-kernel+bounces-44536-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.199.223 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-44536-ouuuleilei=gmail.com@vger.kernel.org"
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by ny.mirrors.kernel.org (Postfix) with ESMTPS id 92D4E1C21278
for <ouuuleilei@gmail.com>; Tue, 30 Jan 2024 11:41:50 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 6506967E8D;
Tue, 30 Jan 2024 11:41:15 +0000 (UTC)
Received: from mail.wantstofly.org (hmm.wantstofly.org [213.239.204.108])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1090B67E85;
Tue, 30 Jan 2024 11:41:10 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=213.239.204.108
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1706614873; cv=none;
b=VMj49Dkr/aFlMZ+bZSvSqSkpALAzehVffiAwgiVtDM+HUCn5XBJXN+jgcyUZ/In7LOOgMehzSLShPH01SRPSSx485De6z+SZ1M6ZCEEMY4qtox9VDg7bRU06DeM3r73BbqgcNflVDGMOSkGBoNioULVsLuD/LCfLut6ZZuwC/lo=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1706614873; c=relaxed/simple;
bh=M1ByWR7A/0OZJyiu8/QxYUCOsnZ1i0g7QJiaIPAWjt0=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:
Content-Disposition;
b=aNeMPPKWufH6mgcIigx0xB3PxXHneUsnDfXy3QQORdueCobuXmuXmp+Kg9KQ9637OZlE1l14eSTYS7GttYiEQdSjsYdftUXvVV7XuzTW2NoSLm+Lyv6xv6YNr+Gqm9zhTXitfOwJcYJM2pwxcp+W0wgGqwnQDyc9mL4kSX127jk=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=none (p=none dis=none) header.from=wantstofly.org;
spf=pass smtp.mailfrom=wantstofly.org;
arc=none smtp.client-ip=213.239.204.108
Authentication-Results: smtp.subspace.kernel.org;
dmarc=none (p=none dis=none) header.from=wantstofly.org
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=wantstofly.org
Received: by mail.wantstofly.org (Postfix, from userid 1000)
id DF1C47F711; Tue, 30 Jan 2024 13:41:02 +0200 (EET)
Date: Tue, 30 Jan 2024 13:41:02 +0200
From: Lennert Buytenhek <kernel@wantstofly.org>
To: Niklas Cassel <cassel@kernel.org>, Damien Le Moal <dlemoal@kernel.org>,
linux-ide@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Robin Murphy <robin.murphy@arm.com>,
John Garry <john.g.garry@oracle.com>,
Joerg Roedel <jroedel@suse.de>,
Szuying Chen <chensiying21@gmail.com>, Jesse1_Chang@asmedia.com.tw,
Richard_Hsu@asmedia.com.tw, Chloe_Chen@asmedia.com.tw
Subject: [PATCH] ahci: Extend ASM1061 43-bit DMA address quirk to other
ASM106x parts
Message-ID: <ZbjgTmR5FbAnb-Ua@wantstofly.org>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1789515436684850338
X-GMAIL-MSGID: 1789515436684850338
|
| Series |
ahci: Extend ASM1061 43-bit DMA address quirk to other ASM106x parts
|
|
Commit Message
Lennert Buytenhek
Jan. 30, 2024, 11:41 a.m. UTC
ASMedia have confirmed that all ASM106x parts currently listed in
ahci_pci_tbl[] suffer from the 43-bit DMA address limitation that we ran
into on the ASM1061, and therefore, we need to apply the quirk added by
commit 20730e9b2778 to the other supported ASM106x parts as well.
Signed-off-by: Lennert Buytenhek <kernel@wantstofly.org>
---
drivers/ata/ahci.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Comments
On 1/30/24 20:41, Lennert Buytenhek wrote: > ASMedia have confirmed that all ASM106x parts currently listed in > ahci_pci_tbl[] suffer from the 43-bit DMA address limitation that we ran > into on the ASM1061, and therefore, we need to apply the quirk added by > commit 20730e9b2778 to the other supported ASM106x parts as well. > > Signed-off-by: Lennert Buytenhek <kernel@wantstofly.org> I think this needs a cc: stable tag. > --- > drivers/ata/ahci.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c > index d2460fa985b7..da2e74fce2d9 100644 > --- a/drivers/ata/ahci.c > +++ b/drivers/ata/ahci.c > @@ -606,13 +606,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { > { PCI_VDEVICE(PROMISE, 0x3781), board_ahci }, /* FastTrak TX8660 ahci-mode */ > > /* ASMedia */ > - { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */ > - { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci }, /* ASM1060 */ > + { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci_43bit_dma }, /* ASM1060 */ > + { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci_43bit_dma }, /* ASM1060 */ > { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci_43bit_dma }, /* ASM1061 */ > { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci_43bit_dma }, /* ASM1061/1062 */ > - { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci }, /* ASM1061R */ > - { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci }, /* ASM1062R */ > - { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci }, /* ASM1062+JMB575 */ > + { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci_43bit_dma }, /* ASM1061R */ > + { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci_43bit_dma }, /* ASM1062R */ > + { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci_43bit_dma }, /* ASM1062+JMB575 */ > { PCI_VDEVICE(ASMEDIA, 0x1062), board_ahci }, /* ASM1062A */ > { PCI_VDEVICE(ASMEDIA, 0x1064), board_ahci }, /* ASM1064 */ > { PCI_VDEVICE(ASMEDIA, 0x1164), board_ahci }, /* ASM1164 */
On Tue, Jan 30, 2024 at 08:46:23PM +0900, Damien Le Moal wrote: > > ASMedia have confirmed that all ASM106x parts currently listed in > > ahci_pci_tbl[] suffer from the 43-bit DMA address limitation that we ran > > into on the ASM1061, and therefore, we need to apply the quirk added by > > commit 20730e9b2778 to the other supported ASM106x parts as well. > > > > Signed-off-by: Lennert Buytenhek <kernel@wantstofly.org> > > I think this needs a cc: stable tag. The commit that is likely responsible for surfacing this issue is 791c2b17fb40 which went into v6.6 -- so would this then be appropriate, or do you think this should be backported to older versions as well? Cc: stable@vger.kernel.org # 6.6.x > > --- > > drivers/ata/ahci.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c > > index d2460fa985b7..da2e74fce2d9 100644 > > --- a/drivers/ata/ahci.c > > +++ b/drivers/ata/ahci.c > > @@ -606,13 +606,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { > > { PCI_VDEVICE(PROMISE, 0x3781), board_ahci }, /* FastTrak TX8660 ahci-mode */ > > > > /* ASMedia */ > > - { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */ > > - { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci }, /* ASM1060 */ > > + { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci_43bit_dma }, /* ASM1060 */ > > + { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci_43bit_dma }, /* ASM1060 */ > > { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci_43bit_dma }, /* ASM1061 */ > > { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci_43bit_dma }, /* ASM1061/1062 */ > > - { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci }, /* ASM1061R */ > > - { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci }, /* ASM1062R */ > > - { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci }, /* ASM1062+JMB575 */ > > + { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci_43bit_dma }, /* ASM1061R */ > > + { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci_43bit_dma }, /* ASM1062R */ > > + { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci_43bit_dma }, /* ASM1062+JMB575 */ > > { PCI_VDEVICE(ASMEDIA, 0x1062), board_ahci }, /* ASM1062A */ > > { PCI_VDEVICE(ASMEDIA, 0x1064), board_ahci }, /* ASM1064 */ > > { PCI_VDEVICE(ASMEDIA, 0x1164), board_ahci }, /* ASM1164 */
On Tue, Jan 30, 2024 at 01:41:02PM +0200, Lennert Buytenhek wrote: > ASMedia have confirmed that all ASM106x parts currently listed in > ahci_pci_tbl[] suffer from the 43-bit DMA address limitation that we ran > into on the ASM1061, and therefore, we need to apply the quirk added by > commit 20730e9b2778 to the other supported ASM106x parts as well. Lennert, thanks a lot for sending this follow up patch. However, checkpatch.pl complains: ERROR: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 20730e9b2778 ("ahci: add 43-bit DMA address quirk for ASMedia ASM1061 controllers")' #44: commit 20730e9b2778 to the other supported ASM106x parts as well. Perhaps send a v2 with this fixed, and Cc: stable like Damien requested. Kind regards, Niklas > > Signed-off-by: Lennert Buytenhek <kernel@wantstofly.org> > --- > drivers/ata/ahci.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c > index d2460fa985b7..da2e74fce2d9 100644 > --- a/drivers/ata/ahci.c > +++ b/drivers/ata/ahci.c > @@ -606,13 +606,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { > { PCI_VDEVICE(PROMISE, 0x3781), board_ahci }, /* FastTrak TX8660 ahci-mode */ > > /* ASMedia */ > - { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */ > - { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci }, /* ASM1060 */ > + { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci_43bit_dma }, /* ASM1060 */ > + { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci_43bit_dma }, /* ASM1060 */ > { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci_43bit_dma }, /* ASM1061 */ > { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci_43bit_dma }, /* ASM1061/1062 */ > - { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci }, /* ASM1061R */ > - { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci }, /* ASM1062R */ > - { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci }, /* ASM1062+JMB575 */ > + { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci_43bit_dma }, /* ASM1061R */ > + { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci_43bit_dma }, /* ASM1062R */ > + { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci_43bit_dma }, /* ASM1062+JMB575 */ > { PCI_VDEVICE(ASMEDIA, 0x1062), board_ahci }, /* ASM1062A */ > { PCI_VDEVICE(ASMEDIA, 0x1064), board_ahci }, /* ASM1064 */ > { PCI_VDEVICE(ASMEDIA, 0x1164), board_ahci }, /* ASM1164 */ > -- > 2.43.0
On 1/30/24 20:59, Lennert Buytenhek wrote: > On Tue, Jan 30, 2024 at 08:46:23PM +0900, Damien Le Moal wrote: > >>> ASMedia have confirmed that all ASM106x parts currently listed in >>> ahci_pci_tbl[] suffer from the 43-bit DMA address limitation that we ran >>> into on the ASM1061, and therefore, we need to apply the quirk added by >>> commit 20730e9b2778 to the other supported ASM106x parts as well. >>> >>> Signed-off-by: Lennert Buytenhek <kernel@wantstofly.org> >> >> I think this needs a cc: stable tag. > > The commit that is likely responsible for surfacing this issue is > 791c2b17fb40 which went into v6.6 -- so would this then be appropriate, > or do you think this should be backported to older versions as well? Hmmm... given this is a hardware "bug", it seems safer to backport to all stable & lts. From what I understand, the device may be doing bad DMA, regardless of what the iommu is doing. Niklas ? you followed this more carefully than I did :) > > Cc: stable@vger.kernel.org # 6.6.x > > >>> --- >>> drivers/ata/ahci.c | 10 +++++----- >>> 1 file changed, 5 insertions(+), 5 deletions(-) >>> >>> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c >>> index d2460fa985b7..da2e74fce2d9 100644 >>> --- a/drivers/ata/ahci.c >>> +++ b/drivers/ata/ahci.c >>> @@ -606,13 +606,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { >>> { PCI_VDEVICE(PROMISE, 0x3781), board_ahci }, /* FastTrak TX8660 ahci-mode */ >>> >>> /* ASMedia */ >>> - { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */ >>> - { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci }, /* ASM1060 */ >>> + { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci_43bit_dma }, /* ASM1060 */ >>> + { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci_43bit_dma }, /* ASM1060 */ >>> { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci_43bit_dma }, /* ASM1061 */ >>> { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci_43bit_dma }, /* ASM1061/1062 */ >>> - { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci }, /* ASM1061R */ >>> - { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci }, /* ASM1062R */ >>> - { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci }, /* ASM1062+JMB575 */ >>> + { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci_43bit_dma }, /* ASM1061R */ >>> + { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci_43bit_dma }, /* ASM1062R */ >>> + { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci_43bit_dma }, /* ASM1062+JMB575 */ >>> { PCI_VDEVICE(ASMEDIA, 0x1062), board_ahci }, /* ASM1062A */ >>> { PCI_VDEVICE(ASMEDIA, 0x1064), board_ahci }, /* ASM1064 */ >>> { PCI_VDEVICE(ASMEDIA, 0x1164), board_ahci }, /* ASM1164 */
On 30/01/2024 12:26 pm, Damien Le Moal wrote: > On 1/30/24 20:59, Lennert Buytenhek wrote: >> On Tue, Jan 30, 2024 at 08:46:23PM +0900, Damien Le Moal wrote: >> >>>> ASMedia have confirmed that all ASM106x parts currently listed in >>>> ahci_pci_tbl[] suffer from the 43-bit DMA address limitation that we ran >>>> into on the ASM1061, and therefore, we need to apply the quirk added by >>>> commit 20730e9b2778 to the other supported ASM106x parts as well. >>>> >>>> Signed-off-by: Lennert Buytenhek <kernel@wantstofly.org> >>> >>> I think this needs a cc: stable tag. >> >> The commit that is likely responsible for surfacing this issue is >> 791c2b17fb40 which went into v6.6 -- so would this then be appropriate, >> or do you think this should be backported to older versions as well? > > Hmmm... given this is a hardware "bug", it seems safer to backport to all stable > & lts. From what I understand, the device may be doing bad DMA, regardless of > what the iommu is doing. Niklas ? you followed this more carefully than I did :) Yes, that would be the case; in practice though it's likely that people just don't tend to use these particular controllers in big systems which actually have RAM at >43-bit physical addresses. Thanks, Robin. > >> >> Cc: stable@vger.kernel.org # 6.6.x >> >> >>>> --- >>>> drivers/ata/ahci.c | 10 +++++----- >>>> 1 file changed, 5 insertions(+), 5 deletions(-) >>>> >>>> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c >>>> index d2460fa985b7..da2e74fce2d9 100644 >>>> --- a/drivers/ata/ahci.c >>>> +++ b/drivers/ata/ahci.c >>>> @@ -606,13 +606,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { >>>> { PCI_VDEVICE(PROMISE, 0x3781), board_ahci }, /* FastTrak TX8660 ahci-mode */ >>>> >>>> /* ASMedia */ >>>> - { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */ >>>> - { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci }, /* ASM1060 */ >>>> + { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci_43bit_dma }, /* ASM1060 */ >>>> + { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci_43bit_dma }, /* ASM1060 */ >>>> { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci_43bit_dma }, /* ASM1061 */ >>>> { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci_43bit_dma }, /* ASM1061/1062 */ >>>> - { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci }, /* ASM1061R */ >>>> - { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci }, /* ASM1062R */ >>>> - { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci }, /* ASM1062+JMB575 */ >>>> + { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci_43bit_dma }, /* ASM1061R */ >>>> + { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci_43bit_dma }, /* ASM1062R */ >>>> + { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci_43bit_dma }, /* ASM1062+JMB575 */ >>>> { PCI_VDEVICE(ASMEDIA, 0x1062), board_ahci }, /* ASM1062A */ >>>> { PCI_VDEVICE(ASMEDIA, 0x1064), board_ahci }, /* ASM1064 */ >>>> { PCI_VDEVICE(ASMEDIA, 0x1164), board_ahci }, /* ASM1164 */ >
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index d2460fa985b7..da2e74fce2d9 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -606,13 +606,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(PROMISE, 0x3781), board_ahci }, /* FastTrak TX8660 ahci-mode */ /* ASMedia */ - { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */ - { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci }, /* ASM1060 */ + { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci_43bit_dma }, /* ASM1060 */ + { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci_43bit_dma }, /* ASM1060 */ { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci_43bit_dma }, /* ASM1061 */ { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci_43bit_dma }, /* ASM1061/1062 */ - { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci }, /* ASM1061R */ - { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci }, /* ASM1062R */ - { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci }, /* ASM1062+JMB575 */ + { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci_43bit_dma }, /* ASM1061R */ + { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci_43bit_dma }, /* ASM1062R */ + { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci_43bit_dma }, /* ASM1062+JMB575 */ { PCI_VDEVICE(ASMEDIA, 0x1062), board_ahci }, /* ASM1062A */ { PCI_VDEVICE(ASMEDIA, 0x1064), board_ahci }, /* ASM1064 */ { PCI_VDEVICE(ASMEDIA, 0x1164), board_ahci }, /* ASM1164 */