From patchwork Wed Jun 16 13:46:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12325265 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DFE6C48BE5 for ; Wed, 16 Jun 2021 13:53:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D163611EE for ; Wed, 16 Jun 2021 13:53:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D163611EE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AbYWSDxApsh0C5lNCclBvCcSIndCEcR7LVyP+sx+D9E=; b=pFKrxSllSkp8zG QaVvP3e/DjgADA8zIbAW4UCc/Efd7PP0EwWBfniydp3f9B4cQwZLHveoah1MD2/zHn2olRbVA5xQR b60Ii2KwH1O5YSt6IYsoOZuLpNYZzAlshBb8ifKWTBEWgCrnjOeCUfTmV8exSpu4+z6671lEztUf6 A4Y4E9lahQj4GzGiUvoV86pEAww7kcTX2OqxfjsA7LKVY+rDmO1sfWql1znhzMZZTN6zXDOJ3PFfn JBZVAbsChOwxVKjGPy/SpktLJgMFRl1Yknwzx+6iMzJRMk2kn1srV5ILQe2eIM2KoxrVC1YWAb4d7 o7RHK5oWTTemdcxPRtFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVxl-006YNs-D8; Wed, 16 Jun 2021 13:52:13 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVtJ-006WUS-UA for linux-arm-kernel@bombadil.infradead.org; Wed, 16 Jun 2021 13:47:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=hz+UUrM8ElLAj/iJo+DmppsdBvwZ+F/R3vYoPMFC1v0=; b=HIXR7KJRvzBTx1oAaTOhFmEuQe 7CrxkQC18XDjnkjby7ybaNzflCoG6u6dQhmFAZo0KG7x2b39Uuv+A32AODZB2lArcUjcu+qbWHefe n81gkVEX4j8vD6cP+WCo3Y76nSvHTwJlVPORP90hsMlal4lckKPFG1aJpU5uw1LKUWLsEEaKymzxW 5SF3TSiQnWUILvnEhwlbu7/aKNZ7ukSi+paqcn2zBgJ03rW+AbDWf+Y09zkefOPw9sIP5kIlJycer GeLGcS0yRcv5hzlgsxqhLHTk4eroIDW0ZMQneIeIyZF5e3pNUT20Cy+7/oP+m/xsKs2KR3goQdRow br23u7wQ==; Received: from [2001:4bb8:19b:fdce:84d:447:81f0:ca60] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVt4-0085ue-Gh; Wed, 16 Jun 2021 13:47:26 +0000 From: Christoph Hellwig To: "David S. Miller" , Jens Axboe , Geert Uytterhoeven Cc: Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Michael Ellerman , Linus Torvalds , linux-ide@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-m68k@lists.linux-m68k.org Subject: [PATCH 1/6] pata_cypress: add a module option to disable BM-DMA Date: Wed, 16 Jun 2021 15:46:53 +0200 Message-Id: <20210616134658.1471835-2-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210616134658.1471835-1-hch@lst.de> References: <20210616134658.1471835-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Multiple users report that they need to disable DMA on this driver, so provide an option to do so without affecting all of libata. Signed-off-by: Christoph Hellwig Reviewed-by: Russell King (Oracle) --- drivers/ata/pata_cypress.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c index e1486fe298ae..5b3a7a8ebef6 100644 --- a/drivers/ata/pata_cypress.c +++ b/drivers/ata/pata_cypress.c @@ -41,6 +41,10 @@ enum { CY82_INDEX_TIMEOUT = 0x32 }; +static bool enable_dma = true; +module_param(enable_dma, bool, 0); +MODULE_PARM_DESC(enable_dma, "Enable bus master DMA operations"); + /** * cy82c693_set_piomode - set initial PIO mode data * @ap: ATA interface @@ -124,14 +128,16 @@ static struct ata_port_operations cy82c693_port_ops = { static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *id) { - static const struct ata_port_info info = { + static struct ata_port_info info = { .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = ATA_PIO4, - .mwdma_mask = ATA_MWDMA2, .port_ops = &cy82c693_port_ops }; const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; + if (enable_dma) + info.mwdma_mask = ATA_MWDMA2; + /* Devfn 1 is the ATA primary. The secondary is magic and on devfn2. For the moment we don't handle the secondary. FIXME */ From patchwork Wed Jun 16 13:46:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12325267 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D67EC48BE5 for ; Wed, 16 Jun 2021 13:54:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E37A611EE for ; Wed, 16 Jun 2021 13:54:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E37A611EE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1k8M/Z3iFH5vHnjrTRD6z2WZBpWovKwjep3XBcPvpQ0=; b=NuAwVap93mCveQ Hhgg8IvX1VFZRpag/9tiEwoKr8SWlU4AmguID8FrffJiP3KFC8MXtJYB9STW1SA4ZdtohgrapBm+3 jWrPpnoTbRZpb+3wTZeKj2/3+rpO1igqmZU8SSmBwiIoJnV5noCKyTZxXg0Ow9xNuVEuz4hHYWfcK U3LfG3JOm0q5yXcDyDlgCJQSA6/TkLGRtvsplFb8l7MVDDf+bl4wY4GKt+9j7ssyV+AKOo2VnTobZ uDxriOZsUfJnhvkRof6enLpPmfDHGnLU15sfnYeu5vjjc6wW5RUbSMfDOd7iIolNT2zYcAi+f2eBV D7hGnjwYXvxqldc6AH/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVyc-006Yhx-RP; Wed, 16 Jun 2021 13:53:07 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVtY-006WdH-UR for linux-arm-kernel@bombadil.infradead.org; Wed, 16 Jun 2021 13:47:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Z+oR1lwZ5IVn0dnTrGxb+exbJ0+qehkMzxmqgtGxNvI=; b=RAwvMhDSv5zEPuUFnlcjK0EpWx 7ELUChd4L54thQuMRzOg2zfS9RqpTgw/vyBawI9J7tgEeEXISKTcbroT/wmiPeYf0srNgEQ4u+h5d 2R70JlxF7sTRJkUBKF97ugLWAKjTqTocZhJhtw+a0g6kJsxwdIHpPTsZSD5brN33mdE3cFB1bAjGp A2qb42n8QRUl3Nvj5f8tWzrZpySKjz7AlZeIBVLWdWqvVkAgzzJ39derG3lZVGmLhUMjOH00AYvCF VuMwmfMZzxHwbZzJodWg0WqVn9qi5ea5T9rFE/NX7klFU2acZfny9mUMnGrY9suphG97KLwMrsJJp v3rgGvTw==; Received: from [2001:4bb8:19b:fdce:84d:447:81f0:ca60] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVtJ-0085vk-MB; Wed, 16 Jun 2021 13:47:45 +0000 From: Christoph Hellwig To: "David S. Miller" , Jens Axboe , Geert Uytterhoeven Cc: Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Michael Ellerman , Linus Torvalds , linux-ide@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-m68k@lists.linux-m68k.org Subject: [PATCH 2/6] alpha: use libata instead of the legacy ide driver Date: Wed, 16 Jun 2021 15:46:54 +0200 Message-Id: <20210616134658.1471835-3-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210616134658.1471835-1-hch@lst.de> References: <20210616134658.1471835-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Switch the alpha defconfig from the legacy ide driver to libata. Signed-off-by: Christoph Hellwig --- arch/alpha/configs/defconfig | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/alpha/configs/defconfig b/arch/alpha/configs/defconfig index 724c4075df40..dd2dd9f0861f 100644 --- a/arch/alpha/configs/defconfig +++ b/arch/alpha/configs/defconfig @@ -25,19 +25,18 @@ CONFIG_PNP=y CONFIG_ISAPNP=y CONFIG_BLK_DEV_FD=y CONFIG_BLK_DEV_LOOP=m -CONFIG_IDE=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_ALI15X3=y -CONFIG_BLK_DEV_CMD64X=y -CONFIG_BLK_DEV_CY82C693=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=253 # CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_ATA=y +# CONFIG_SATA_PMP is not set +CONFIG_PATA_ALI=y +CONFIG_PATA_CMD64X=y +CONFIG_PATA_CYPRESS=y +CONFIG_ATA_GENERIC=y CONFIG_NETDEVICES=y CONFIG_DUMMY=m CONFIG_NET_ETHERNET=y From patchwork Wed Jun 16 13:46:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12325269 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A797EC48BE8 for ; Wed, 16 Jun 2021 13:57:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 68D67601FC for ; Wed, 16 Jun 2021 13:57:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 68D67601FC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5oSWiwBR+XeQLIAo7CfdI08xMzIZtrueoZ2GNKkTQzU=; b=nmpFwmoVFdRQX4 MQHdjbpGFjg4eAjXuBWkM0akdv4mRiz/zkGEfSl0OSXXGpxysSrIE51fwpKhsvONZKcSGGZs7GVQG GoALVuc1ARuyHuZVsew4mFDOmwul3b52V9lCtSenPt+BsUlWkJ0zGdTJwRePC5nsuQqJ+chc+EOwI TVL3oBQIYVhhHZKABjYpu3swprUn/PnN0bXXchy2r2k3oCpN5YBRokdeeQt0HeBmA8Foi1iFqWq+4 s/p5LJyzx3aGlmHkHbwt6EkpjsLObB8tIMAxkm+pj+EJzyNfnV9E0LaQaIEXgCdQ9qIohpAQc9Us8 SGhuKqQypxKnofQAFyhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltW0Y-006ZVq-K4; Wed, 16 Jun 2021 13:55:07 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVuU-006X2W-Bo for linux-arm-kernel@bombadil.infradead.org; Wed, 16 Jun 2021 13:48:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=FMWvGRuwohYEWT60Xs3SNXFuVN9yohix5OohuODqhyc=; b=br6x+NzkKsABPjh4jOMQRt+Zjs gkdBwBVrSRYcH9YV1BCMRs6gxXgSvR4t+dk0VfWfxUcx2En6qoLLVbtkpsJIn8zYOSX5MaFnlf+AC s4BYfkNSUFiHCLm3ZcCww+RvneOVfXyAfuLBX8amyd9zZemo0reYeT2uJr9azat6P9I9CsNHEEdDZ CmwHfSySJeALbsd4d3uhC5pUpUHCINLOSsFRnpY5MZElh0Sb9XXS+5tAA1bhHNBsOeGDIaPOD+Rid n5k0mgTuzhGTEIpQR22LwdrLS1wcqaP8RQrmNjGMsTfgGhT6EX79eRjnXHZhxYh+/Ozc7L4iXfFCL EWgrOXcA==; Received: from [2001:4bb8:19b:fdce:84d:447:81f0:ca60] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVu1-0085zL-Mk; Wed, 16 Jun 2021 13:48:30 +0000 From: Christoph Hellwig To: "David S. Miller" , Jens Axboe , Geert Uytterhoeven Cc: Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Michael Ellerman , Linus Torvalds , linux-ide@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-m68k@lists.linux-m68k.org Subject: [PATCH 3/6] ARM: disable CONFIG_IDE in footbridge_defconfig Date: Wed, 16 Jun 2021 15:46:55 +0200 Message-Id: <20210616134658.1471835-4-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210616134658.1471835-1-hch@lst.de> References: <20210616134658.1471835-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org footbridge_defconfig enables CONFIG_IDE but no actual host controller driver, so just drop it. Signed-off-by: Christoph Hellwig --- arch/arm/configs/footbridge_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/footbridge_defconfig b/arch/arm/configs/footbridge_defconfig index 2aa3ebeb89d7..7a32de51f0fa 100644 --- a/arch/arm/configs/footbridge_defconfig +++ b/arch/arm/configs/footbridge_defconfig @@ -64,7 +64,6 @@ CONFIG_PARIDE_ON26=m CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_RAM=y -CONFIG_IDE=y CONFIG_NETDEVICES=y CONFIG_NET_ETHERNET=y CONFIG_NET_VENDOR_3COM=y From patchwork Wed Jun 16 13:46:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12325273 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 913EFC48BE5 for ; Wed, 16 Jun 2021 13:57:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 61307601FC for ; Wed, 16 Jun 2021 13:57:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61307601FC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LwpOdA2IyusG7qq5DiKiSXZ2qik0tuMpfR9Lxk6VWCM=; b=4nHOo30EsU0LoN tgANzts5ZFTrpeMtkOocS3qSuWY6QguWDrJPGdfzVYBQZVX+/DvVlrQXh66FXu5Qht6A17xU9qDG0 BVHaD65X94snwUY7NF7OmYG/KWESxI2LJVd0tWkA41AGyJygk64aZrWEkNpfXGdDAugX+6fTKrhjq EV5kZTua6uA1DoZOsbr4HnIudzIAfPa+z9hLcKxCMmuCgGdMrqJF86v5ja+8vzoTGrz806TzrEiNk Js5GA+vb02YwCcfyZlM5xH0XfU/2lw74+biBl9of5s9wB+VX+h0bLSbUfCtamzf20Ll64U/c1qyqu BLCYXa5vKaug5NLdoRww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltW1K-006Zsg-Dm; Wed, 16 Jun 2021 13:55:54 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVv4-006XIe-Ru for linux-arm-kernel@bombadil.infradead.org; Wed, 16 Jun 2021 13:49:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Uuuw+EDFBfHtUMgcBMPNTshRzz5rBLJMAuak5V48lNU=; b=qaqnCkDXikQQBHKgCwgIp11kIy 2ueiMB+Y0zbmFHTfaBG9LRfpZbgfNtkA5Q7qKMbXAOLHSSY9rsW3Wf85ytYrY4nIAB4If6RYEvWp6 UV1NsPXMrvphdW/xoLmZw1vNDMgUPkrsGohQ9DQvqkNz9L06lyofIjHzEZskRnHLfOolctVu1R7J5 zP6qO4qpbgevda75Lh/N7aJVVZODUeeRS9PJxHMBlRk3I16UwzgRQTMZ9Nhg3YndYXfnnw76+fWLe J+dDaT2q8blTLTXAIQcZ5q39iE094tXk6KQb7Q2DxP6L1t7g3NnUa9U2DXmuQTcO+8KtvXxgXIR5i dg29zMYQ==; Received: from [2001:4bb8:19b:fdce:84d:447:81f0:ca60] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVud-00863t-Nm; Wed, 16 Jun 2021 13:49:06 +0000 From: Christoph Hellwig To: "David S. Miller" , Jens Axboe , Geert Uytterhoeven Cc: Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Michael Ellerman , Linus Torvalds , linux-ide@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-m68k@lists.linux-m68k.org Subject: [PATCH 4/6] ARM: disable CONFIG_IDE in pxa_defconfig Date: Wed, 16 Jun 2021 15:46:56 +0200 Message-Id: <20210616134658.1471835-5-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210616134658.1471835-1-hch@lst.de> References: <20210616134658.1471835-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pxa_defconfig already enables libata including the pata_pcmcia driver, so drop the legacy ide driver and idecs host driver. Signed-off-by: Christoph Hellwig --- arch/arm/configs/pxa_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 875a3c28a267..363f1b1b08e3 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -215,8 +215,6 @@ CONFIG_IIO=m CONFIG_AD5446=m CONFIG_EEPROM_AT24=m CONFIG_SENSORS_LIS3_SPI=m -CONFIG_IDE=m -CONFIG_BLK_DEV_IDECS=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_ST=m From patchwork Wed Jun 16 13:46:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12325275 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UPPERCASE_50_75, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC61CC48BE6 for ; Wed, 16 Jun 2021 13:59:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 73CC761241 for ; Wed, 16 Jun 2021 13:59:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 73CC761241 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mQW/DxPCusUwED5AVewP4KZMYn+DB50ISvZSdTtv9vo=; b=nZcZ3DP03UQqya biEWVKrt7vEhS79Toqj37iPQhedE5hqfGjoKo9S9Odh9r4aOL1+pQ7oG/AAhAPYnuGGxahXPgWM8r Jat0ouK/jE5rEsysZ5beMSOgJS82C9nx8L0MSM+4o7Vs8Dn1yeLRV/7qkFA3d6zUpEDFnfcIz+9Cs hbIeoxXj+WOwt48tXDpA+o0n/k7SypLHgpAKlwKvp2gixcbU35Fu71XZZ/ucmw9AIiFX8pjt6mken dCXk3Q7+vK4Ser8DG48XDXOtai/4YPvbhKy1+htSbv8ksDE5QGvbtR9dlq8JAJrwjWMk6NU0IXr+C 5xmMb8rHpC/oVQ/3aUVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltW2f-006aRi-BI; Wed, 16 Jun 2021 13:57:18 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVvc-006XXi-IO for linux-arm-kernel@bombadil.infradead.org; Wed, 16 Jun 2021 13:50:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=ghV8FofT/1S4G+Z5TMsWzHZydL55epexGiHCR5TOBAA=; b=l1aot1gcHfgHNK23M1842LV+x8 Q8d0roYwIMyC+erN/eCZkuogTJpBaqMYJsdBQNBRSlaTvJE3uEST7mQ8K1lLBTvB4fJzMA0ZJN9Oa ObSF2PdH6gFHeRmOdqKLGVPWVnTWGoCT5LVAlnRFPKGFZ9zt1JO3nfzV8p1Ko1tFtbi3Km79nvHSe Ic/fJK+thesvlnGbzAXt7r5MuPV0RSU9vbYBlW05mivqUphKQtS+ck2E0SZg96TAXbp3AKN+dsHr6 vAetPA5hUuphKKpekc29unyWVaQxfbtJA7PGfEvddz6b8goFPbYgC8lQOI4WpeYwTW4qd+dsxKSGa UTzhJpvg==; Received: from [2001:4bb8:19b:fdce:84d:447:81f0:ca60] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltVv9-00866d-N7; Wed, 16 Jun 2021 13:49:41 +0000 From: Christoph Hellwig To: "David S. Miller" , Jens Axboe , Geert Uytterhoeven Cc: Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Michael Ellerman , Linus Torvalds , linux-ide@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-m68k@lists.linux-m68k.org Subject: [PATCH 5/6] m68k: use libata instead of the legacy ide driver Date: Wed, 16 Jun 2021 15:46:57 +0200 Message-Id: <20210616134658.1471835-6-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210616134658.1471835-1-hch@lst.de> References: <20210616134658.1471835-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Switch the m68 defconfigs from the deprecated ide subsystem to use libata instead. The gayle and buddha and falcon drivers are enabled for libata, while support for the q40 and macide drivers is lost. Signed-off-by: Christoph Hellwig Acked-by: Geert Uytterhoeven --- arch/m68k/configs/amiga_defconfig | 10 +++++----- arch/m68k/configs/atari_defconfig | 8 ++++---- arch/m68k/configs/mac_defconfig | 8 ++++---- arch/m68k/configs/multi_defconfig | 14 +++++++------- arch/m68k/configs/q40_defconfig | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 59b727b69357..4fe26d54627e 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -323,11 +323,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_CDROM_PKTCDVD=m CONFIG_ATA_OVER_ETH=m CONFIG_DUMMY_IRQ=m -CONFIG_IDE=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_GAYLE=y -CONFIG_BLK_DEV_BUDDHA=y CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y @@ -344,6 +339,11 @@ CONFIG_GVP11_SCSI=y CONFIG_SCSI_A4000T=y CONFIG_SCSI_ZORRO7XX=y CONFIG_SCSI_ZORRO_ESP=y +CONFIG_ATA=y +# CONFIG_ATA_VERBOSE_ERROR is not set +# CONFIG_ATA_BMDMA is not set +CONFIG_PATA_GAYLE=y +CONFIG_PATA_BUDDHA=y CONFIG_MD=y CONFIG_MD_LINEAR=m CONFIG_BLK_DEV_DM=m diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 9cc9f1a06516..21b2990fe9af 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -324,10 +324,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_CDROM_PKTCDVD=m CONFIG_ATA_OVER_ETH=m CONFIG_DUMMY_IRQ=m -CONFIG_IDE=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_FALCON_IDE=y CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y @@ -339,6 +335,10 @@ CONFIG_SCSI_SAS_ATTRS=m CONFIG_ISCSI_TCP=m CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ATARI_SCSI=y +CONFIG_ATA=y +# CONFIG_ATA_VERBOSE_ERROR is not set +# CONFIG_ATA_BMDMA is not set +CONFIG_PATA_FALCON=y CONFIG_MD=y CONFIG_MD_LINEAR=m CONFIG_BLK_DEV_DM=m diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 406d3f2a16ea..b03300df13fc 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -315,10 +315,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_CDROM_PKTCDVD=m CONFIG_ATA_OVER_ETH=m CONFIG_DUMMY_IRQ=m -CONFIG_IDE=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_PLATFORM=y CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y @@ -331,6 +327,10 @@ CONFIG_ISCSI_TCP=m CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_MAC_SCSI=y CONFIG_SCSI_MAC_ESP=y +CONFIG_ATA=y +# CONFIG_ATA_VERBOSE_ERROR is not set +# CONFIG_ATA_BMDMA is not set +CONFIG_PATA_PLATFORM=y CONFIG_MD=y CONFIG_MD_LINEAR=m CONFIG_BLK_DEV_DM=m diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index f0992435e9ef..e2c8368e2231 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -344,13 +344,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_CDROM_PKTCDVD=m CONFIG_ATA_OVER_ETH=m CONFIG_DUMMY_IRQ=m -CONFIG_IDE=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_PLATFORM=y -CONFIG_BLK_DEV_GAYLE=y -CONFIG_BLK_DEV_BUDDHA=y -CONFIG_BLK_DEV_FALCON_IDE=y CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y @@ -374,6 +367,13 @@ CONFIG_MVME147_SCSI=y CONFIG_MVME16x_SCSI=y CONFIG_BVME6000_SCSI=y CONFIG_SUN3X_ESP=y +CONFIG_ATA=y +# CONFIG_ATA_VERBOSE_ERROR is not set +# CONFIG_ATA_BMDMA is not set +CONFIG_PATA_FALCON=y +CONFIG_PATA_GAYLE=y +CONFIG_PATA_BUDDHA=y +CONFIG_PATA_PLATFORM=y CONFIG_MD=y CONFIG_MD_LINEAR=m CONFIG_BLK_DEV_DM=m diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index b893163d9f06..514e2e8cddbd 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -314,10 +314,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_CDROM_PKTCDVD=m CONFIG_ATA_OVER_ETH=m CONFIG_DUMMY_IRQ=m -CONFIG_IDE=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_FALCON_IDE=y CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y @@ -328,6 +324,10 @@ CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_SAS_ATTRS=m CONFIG_ISCSI_TCP=m CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_ATA=y +# CONFIG_ATA_VERBOSE_ERROR is not set +# CONFIG_ATA_BMDMA is not set +CONFIG_PATA_FALCON=y CONFIG_MD=y CONFIG_MD_LINEAR=m CONFIG_BLK_DEV_DM=m