From patchwork Wed Feb 14 13:00:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 1898936 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=gAixjuOD; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=linux-ide+bounces-546-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TZdcK6WGCz23j8 for ; Thu, 15 Feb 2024 00:01:21 +1100 (AEDT) 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 am.mirrors.kernel.org (Postfix) with ESMTPS id 9133C1F21B91 for ; Wed, 14 Feb 2024 13:01:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5CBA752F8A; Wed, 14 Feb 2024 13:01:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gAixjuOD" X-Original-To: linux-ide@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1EF58524CF for ; Wed, 14 Feb 2024 13:01:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707915676; cv=none; b=usnktEz7K542NZvYJg3e6DC+XLkWq7BHGbTx6VHFsSpgfJnrKS3taxUUEN69Zx8uKu1i6/smMZ5nPr+HYLiY5Czqf4KV6l59qL3APsXtdRTj/buNkVWlJX3yac4BmXnt7yGhUWy5yud3djPwqDVK/uP+9+H+fhN99nleFpGkQ3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707915676; c=relaxed/simple; bh=pzUGy3QoYut1UhUr+3npruNiDitOvErQ46ai3tD8zOI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tAUMNjF6dExHEQhKfIS9qrEHUXi9fModM+DQd6rojT00huqkxm3nRWIhidHUbIT8lrgCUxdJm9oCJdzkHTpOHoO2QlZgbpkAC2TLipospEjGYVQPdmY7Q0S6B1bz3wI6AB6ECny1uFveWzlPgbOISYehrzMXe3+uBtNZBgmhLoM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gAixjuOD; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80F6FC433F1; Wed, 14 Feb 2024 13:01:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707915675; bh=pzUGy3QoYut1UhUr+3npruNiDitOvErQ46ai3tD8zOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gAixjuODWeiHyVN2nVAvt9I94W1YFGnxBam8x0t1SdcEHkc9OUZGoyAvbnnKdKaGc j15j+uuNxjCM/1Lkv1nS8o8YQNAkqSDcBA4x/LY8+KtLyE2o/EhcvP7RjxLE5bY7W7 4sybDkGnd+mDhY4v8V0fKtOYv60L3TGezx+TF1iEpwdi3klSfSUs/g9CgWfmkACdLF dit0HEP6Tl9eibSBmns6Tro25bQH8/jKn8JGf9Ijqvi0p80JxFKax6ONSY0ljmNvJE r7fcXsgM7MML1uz0t3oPIC7YZCMrIJi62UsWLI6TJWoNN1MragNHz1CpjrDg1cY17f o4MRTBUmOEOAg== From: Niklas Cassel To: Damien Le Moal , Niklas Cassel , Dan Williams , Mika Westerberg Cc: linux-ide@vger.kernel.org Subject: [PATCH v2 1/4] ahci: rename board_ahci_nosntf Date: Wed, 14 Feb 2024 14:00:09 +0100 Message-ID: <20240214130015.952685-2-cassel@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214130015.952685-1-cassel@kernel.org> References: <20240214130015.952685-1-cassel@kernel.org> Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Reviewed-by: Damien Le Moal --- drivers/ata/ahci.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 41b4c9777c85..a2efe916c6e2 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -53,7 +53,6 @@ enum board_ids { board_ahci_no_debounce_delay, board_ahci_nomsi, board_ahci_noncq, - board_ahci_nosntf, /* * board_ahci_pcs_quirk is for legacy Intel platforms. * Modern Intel platforms should use board_ahci instead. @@ -62,6 +61,7 @@ enum board_ids { * without testing that the platform actually works without the quirk.) */ board_ahci_pcs_quirk, + board_ahci_pcs_quirk_no_sntf, board_ahci_yes_fbs, /* board IDs for specific chipsets in alphabetical order */ @@ -165,16 +165,16 @@ static const struct ata_port_info ahci_port_info[] = { .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, - [board_ahci_nosntf] = { - AHCI_HFLAGS (AHCI_HFLAG_NO_SNTF | - AHCI_HFLAG_INTEL_PCS_QUIRK), + [board_ahci_pcs_quirk] = { + AHCI_HFLAGS (AHCI_HFLAG_INTEL_PCS_QUIRK), .flags = AHCI_FLAG_COMMON, .pio_mask = ATA_PIO4, .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, - [board_ahci_pcs_quirk] = { - AHCI_HFLAGS (AHCI_HFLAG_INTEL_PCS_QUIRK), + [board_ahci_pcs_quirk_no_sntf] = { + AHCI_HFLAGS (AHCI_HFLAG_INTEL_PCS_QUIRK | + AHCI_HFLAG_NO_SNTF), .flags = AHCI_FLAG_COMMON, .pio_mask = ATA_PIO4, .udma_mask = ATA_UDMA6, @@ -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_pcs_quirk_no_sntf }, /* 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 */ From patchwork Wed Feb 14 13:00:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 1898935 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=r6LwmzkN; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45e3:2400::1; helo=sv.mirrors.kernel.org; envelope-from=linux-ide+bounces-547-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TZdcK3WXCz23hM for ; Thu, 15 Feb 2024 00:01:21 +1100 (AEDT) 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id ED9A52886EE for ; Wed, 14 Feb 2024 13:01:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9FDAD52F82; Wed, 14 Feb 2024 13:01:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="r6LwmzkN" X-Original-To: linux-ide@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5F578524CF for ; Wed, 14 Feb 2024 13:01:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707915679; cv=none; b=hz2FAj0rtlQfjMogU+D/Ey+ADBOKES8FqFo1J92NR6MpKOAKF4GtJD8IaFegrewiJ6GHVVv/M7R3URVvqWtftjW8mqbfgduTAri6t1MTaOeQNm05vD/vUhhnhYe4kiWcdy7+8x85lf96IQY5aNh4eIxQTLMAec3xL2fDrcpmfvg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707915679; c=relaxed/simple; bh=L20ciClvYZHH9gtUIEiC0xm2wBDQdImDTyV5f7Kmm2s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BTQD7BnWi6Ww9cJ03Rg1W4r5BRM2zarQFet0kUfneagYiiH3DTGLD0Yqbaoo4WrkC6icHWUbVhysDVHKpVGKrWsBn1yp6d4TSL3YvtbKjBKGzSMswfcahcOqZ33vAEkBmcW094XHsoP97xgwGKlErhUdksC7jVHPAPtdtsSORfs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=r6LwmzkN; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 026F9C433C7; Wed, 14 Feb 2024 13:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707915678; bh=L20ciClvYZHH9gtUIEiC0xm2wBDQdImDTyV5f7Kmm2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r6LwmzkNc23oQVMEg4Ab3qsqtLHEVXIeAKzydJUKbAX1HoUm+a5lWcE6N0W40zSXP cJvmjGKUHCYU5OslnfSUwXAvwlUj1I91IPeVqr3ZEjK/Yiks6JG8YBzBmMjmUTlXmj pxup4W8TGipiExkaZwi+wqRCU8xnQ4JgU3TNvmfzBOg/Gne9iAUm50OBrUcu0mZ1v2 WEH/wuE9kXG/ovLXRDuWmwwJNGvqhPLymBlPA9FQw8n3MLkocKm8Uxie4PK54Yz6UP Jmz7mcjeiV8qxev+NcSWw8tlBHHut1WXgRXA6F0uyhgLwDTDLlBSlfzYcYGKt/cCG7 ks73RFZfd5f6g== From: Niklas Cassel To: Damien Le Moal , Niklas Cassel Cc: Mika Westerberg , Dan Williams , linux-ide@vger.kernel.org Subject: [PATCH v2 2/4] ahci: clean up ahci_broken_devslp quirk Date: Wed, 14 Feb 2024 14:00:10 +0100 Message-ID: <20240214130015.952685-3-cassel@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214130015.952685-1-cassel@kernel.org> References: <20240214130015.952685-1-cassel@kernel.org> Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Most quirks are applied using a specific board type board_ahci_no* (e.g. board_ahci_nomsi, board_ahci_noncq), which then sets a flag representing the specific quirk. ahci_pci_tbl (which is the table of all supported PCI devices), then uses that board type for the PCI vendor and device IDs which need to be quirked. The ahci_broken_devslp quirk is not implemented in this standard way. Modify the ahci_broken_devslp quirk to be implemented like the other quirks. This way, we will not have the same PCI device and vendor ID scattered over ahci.c. It will simply be defined in a single location. Suggested-by: Dan Williams Signed-off-by: Niklas Cassel Reviewed-by: Damien Le Moal --- drivers/ata/ahci.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index a2efe916c6e2..d8e5b26524f6 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -61,6 +61,7 @@ enum board_ids { * without testing that the platform actually works without the quirk.) */ board_ahci_pcs_quirk, + board_ahci_pcs_quirk_no_devslp, board_ahci_pcs_quirk_no_sntf, board_ahci_yes_fbs, @@ -172,6 +173,14 @@ static const struct ata_port_info ahci_port_info[] = { .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, + [board_ahci_pcs_quirk_no_devslp] = { + AHCI_HFLAGS (AHCI_HFLAG_INTEL_PCS_QUIRK | + AHCI_HFLAG_NO_DEVSLP), + .flags = AHCI_FLAG_COMMON, + .pio_mask = ATA_PIO4, + .udma_mask = ATA_UDMA6, + .port_ops = &ahci_ops, + }, [board_ahci_pcs_quirk_no_sntf] = { AHCI_HFLAGS (AHCI_HFLAG_INTEL_PCS_QUIRK | AHCI_HFLAG_NO_SNTF), @@ -420,7 +429,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x06d7), board_ahci_pcs_quirk }, /* Comet Lake-H RAID */ { PCI_VDEVICE(INTEL, 0xa386), board_ahci_pcs_quirk }, /* Comet Lake PCH-V RAID */ { PCI_VDEVICE(INTEL, 0x0f22), board_ahci_pcs_quirk }, /* Bay Trail AHCI */ - { PCI_VDEVICE(INTEL, 0x0f23), board_ahci_pcs_quirk }, /* Bay Trail AHCI */ + { PCI_VDEVICE(INTEL, 0x0f23), board_ahci_pcs_quirk_no_devslp }, /* Bay Trail AHCI */ { PCI_VDEVICE(INTEL, 0x22a3), board_ahci_pcs_quirk }, /* Cherry Tr. AHCI */ { PCI_VDEVICE(INTEL, 0x5ae3), board_ahci_pcs_quirk }, /* ApolloLake AHCI */ { PCI_VDEVICE(INTEL, 0x34d3), board_ahci_pcs_quirk }, /* Ice Lake LP AHCI */ @@ -1420,17 +1429,6 @@ static bool ahci_broken_online(struct pci_dev *pdev) return pdev->bus->number == (val >> 8) && pdev->devfn == (val & 0xff); } -static bool ahci_broken_devslp(struct pci_dev *pdev) -{ - /* device with broken DEVSLP but still showing SDS capability */ - static const struct pci_device_id ids[] = { - { PCI_VDEVICE(INTEL, 0x0f23)}, /* Valleyview SoC */ - {} - }; - - return pci_match_id(ids, pdev); -} - #ifdef CONFIG_ATA_ACPI static void ahci_gtf_filter_workaround(struct ata_host *host) { @@ -1823,10 +1821,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) &dev_attr_remapped_nvme.attr, NULL); - /* must set flag prior to save config in order to take effect */ - if (ahci_broken_devslp(pdev)) - hpriv->flags |= AHCI_HFLAG_NO_DEVSLP; - #ifdef CONFIG_ARM64 if (pdev->vendor == PCI_VENDOR_ID_HUAWEI && pdev->device == 0xa235 && From patchwork Wed Feb 14 13:00:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 1898937 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=T7yIt3iu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45e3:2400::1; helo=sv.mirrors.kernel.org; envelope-from=linux-ide+bounces-548-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TZdcN62X3z23hM for ; Thu, 15 Feb 2024 00:01:24 +1100 (AEDT) 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 8DC45288C4F for ; Wed, 14 Feb 2024 13:01:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4125C52F8A; Wed, 14 Feb 2024 13:01:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="T7yIt3iu" X-Original-To: linux-ide@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 034B752F6E for ; Wed, 14 Feb 2024 13:01:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707915683; cv=none; b=s6kMKAH70T7PqlXogvuRRwSMXdSzyDh3UhOzSro8wH6iIV1eSUyLYDcGdEGQYzSHkPnREUPygJwYDf7xK8I8C7NnDngsrrSIVt7wVVVlZWOI3HE4YsogaTtF+ox5iw6pF5RqXHY2CDn/S0/e+5jp8ZZpNBEcOIRiPC84gl1ib/E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707915683; c=relaxed/simple; bh=6NgQKlzYmOU6+vffAr++oN2Zi/2QxjKiPC8KoDmxzPs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wk4k7AYSRoeEsuXIe4WnC/UoG/OrwpZ5GRtQu5BBeA6YF8lc1csuosxpOLngoYnkVScfvTJ/FWIkstdZrHex2qHVoADqylVgQz98OMcqE/uxtB/va28Xs2kSebPFsgp+nOH/0s8JtZoNF3XYqQptb95wOxNmQ7rDMKvFxrTSXdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T7yIt3iu; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 462E7C433F1; Wed, 14 Feb 2024 13:01:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707915682; bh=6NgQKlzYmOU6+vffAr++oN2Zi/2QxjKiPC8KoDmxzPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T7yIt3iuuU6alxe9g1bsYATBxQ/+l22XXPJvqzKvz+HWuUAbbyq3kmTNBmcQhqQ+f UPfqS9nhhz809BM4oqpheeXBAUw78FVa7vCvOjuw8Segp3IS+pcF+XSGcER/wuXHj0 l0gGs18y1qwIXlsNs7+sgxiPitfzWXVZ9fduYe861Cr3HggtFheCu6aHymsPh0v/Sm aEG+H5OuDpD5u0KZea4h5fxrqU0cDjuqPweZ0cNnQ4BidZ4ahJDSXcvO1fEpF7jIce B6NKcpEbGWtO3zlse3jNcFG+VmvIz1+LgvjdCxDvqpiNeA3/GBBs4v5GtwCEMg+/ts eCe5Hnv5nHHCA== From: Niklas Cassel To: Damien Le Moal , Niklas Cassel Cc: Mika Westerberg , Dan Williams , linux-ide@vger.kernel.org Subject: [PATCH v2 3/4] ahci: drop unused board_ahci_noncq Date: Wed, 14 Feb 2024 14:00:11 +0100 Message-ID: <20240214130015.952685-4-cassel@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214130015.952685-1-cassel@kernel.org> References: <20240214130015.952685-1-cassel@kernel.org> Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since commit 66a7cbc303f4 ("ahci: disable MSI instead of NCQ on Samsung pci-e SSDs on macbooks") there is not a single entry in ahci_pci_tbl which uses board_ahci_noncq. Since this is dead code, let's remove it. We cannot remove AHCI_HFLAG_NO_NCQ, as this flag is still used by other boards. Signed-off-by: Niklas Cassel Reviewed-by: Damien Le Moal --- drivers/ata/ahci.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index d8e5b26524f6..9bff90fb0591 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -52,7 +52,6 @@ enum board_ids { board_ahci_ign_iferr, board_ahci_no_debounce_delay, board_ahci_nomsi, - board_ahci_noncq, /* * board_ahci_pcs_quirk is for legacy Intel platforms. * Modern Intel platforms should use board_ahci instead. @@ -159,13 +158,6 @@ static const struct ata_port_info ahci_port_info[] = { .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, - [board_ahci_noncq] = { - AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ), - .flags = AHCI_FLAG_COMMON, - .pio_mask = ATA_PIO4, - .udma_mask = ATA_UDMA6, - .port_ops = &ahci_ops, - }, [board_ahci_pcs_quirk] = { AHCI_HFLAGS (AHCI_HFLAG_INTEL_PCS_QUIRK), .flags = AHCI_FLAG_COMMON, From patchwork Wed Feb 14 13:00:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 1898938 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=W85qg4gp; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=139.178.88.99; helo=sv.mirrors.kernel.org; envelope-from=linux-ide+bounces-549-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [139.178.88.99]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TZdcR6fcJz23hM for ; Thu, 15 Feb 2024 00:01:27 +1100 (AEDT) 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 949A3288F66 for ; Wed, 14 Feb 2024 13:01:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 49F3E52F99; Wed, 14 Feb 2024 13:01:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="W85qg4gp" X-Original-To: linux-ide@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0B46E52F7C for ; Wed, 14 Feb 2024 13:01:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707915686; cv=none; b=jQ1VP6oISSL1B/fpg1Mh2EeyB577fJn8r/Cf78BNIDvk/r5v5OlYxD8bBAwGNJIhbUesZyGUqK5pJt7LCLlcLpKVTc/H67hgZpu+NTVgdenE6SVwsfNx/Cq2jzMNo9VHgHOUjuNHior2iFHbkzz/5FtODFIlRXwzg1OXDNcIuVA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707915686; c=relaxed/simple; bh=PvHGi+JDdKZZF6VbMXBXMx1RFAPK0PLlLCK2+SPKpmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZUjq7D/3IRMNGAGZtjhForKwOmJd1ZRHeifPqdKsRTw5+jFJfu0wXynICzxMxGpEIZTpvciu+HSGX0B/JLhtQrbCbN+W/V5sbq9pEmGTLdp37W7IzaCkl/mX6ztagz8qvCG4KNLong2cxkKWuxI1tcDo2ZA6MrXvKZyPN508ru0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W85qg4gp; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4D9BC433C7; Wed, 14 Feb 2024 13:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707915685; bh=PvHGi+JDdKZZF6VbMXBXMx1RFAPK0PLlLCK2+SPKpmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W85qg4gpepZLhKZxXcQX/dwuNylQHToqEA9xOHrX7JkLbfH6M4PPYZm1pXvGkqrl5 FEL9FRdv4kgWw8z8ay+k+DQ/dCc8FZkHeNgwfCk0bgPLiThs96sLS+aCxNn/B/bLRX Ur5OzkDVz3C0d5/4N5btuEfdUPWV66NcStzRP5pZGGWWeIm1mkcH46dZPQ2XR/vEda 4apU/zLBVLY+QbnIFoycoy4nelWsVK2SIq7NY61nLTFu3/oM4QtvZJC3W+p/vzpzIw xXlgZmi9TQZcuRL63uHjgQ0Gw+pF17vHZxX9l+vRwZBp3Oqpeya44TnLdlKUx6Nicg vS3rp17uMlvnw== From: Niklas Cassel To: Damien Le Moal , Niklas Cassel Cc: Mika Westerberg , Dan Williams , linux-ide@vger.kernel.org Subject: [PATCH v2 4/4] ahci: rename board_ahci_nomsi Date: Wed, 14 Feb 2024 14:00:12 +0100 Message-ID: <20240214130015.952685-5-cassel@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214130015.952685-1-cassel@kernel.org> References: <20240214130015.952685-1-cassel@kernel.org> Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The naming format of the board_ahci_no* boards are: board_ahci_no_debounce_delay board_ahci_pcs_quirk_no_devslp board_ahci_pcs_quirk_no_sntf Rename board_ahci_nomsi to board_ahci_no_msi to match the other boards. Signed-off-by: Niklas Cassel Reviewed-by: Damien Le Moal --- drivers/ata/ahci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 9bff90fb0591..006312f5d73c 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -51,7 +51,7 @@ enum board_ids { board_ahci_43bit_dma, board_ahci_ign_iferr, board_ahci_no_debounce_delay, - board_ahci_nomsi, + board_ahci_no_msi, /* * board_ahci_pcs_quirk is for legacy Intel platforms. * Modern Intel platforms should use board_ahci instead. @@ -151,7 +151,7 @@ static const struct ata_port_info ahci_port_info[] = { .udma_mask = ATA_UDMA6, .port_ops = &ahci_ops, }, - [board_ahci_nomsi] = { + [board_ahci_no_msi] = { AHCI_HFLAGS (AHCI_HFLAG_NO_MSI), .flags = AHCI_FLAG_COMMON, .pio_mask = ATA_PIO4, @@ -621,8 +621,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { * Samsung SSDs found on some macbooks. NCQ times out if MSI is * enabled. https://bugzilla.kernel.org/show_bug.cgi?id=60731 */ - { PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_nomsi }, - { PCI_VDEVICE(SAMSUNG, 0xa800), board_ahci_nomsi }, + { PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_no_msi }, + { PCI_VDEVICE(SAMSUNG, 0xa800), board_ahci_no_msi }, /* Enmotus */ { PCI_DEVICE(0x1c44, 0x8000), board_ahci },