From patchwork Tue Oct 9 13:24:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10632565 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE56813AA for ; Tue, 9 Oct 2018 13:27:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3542289DF for ; Tue, 9 Oct 2018 13:27:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6CA828A5D; Tue, 9 Oct 2018 13:27:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69EB4289DF for ; Tue, 9 Oct 2018 13:27:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 492056B0291; Tue, 9 Oct 2018 09:26:25 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 378FD6B028E; Tue, 9 Oct 2018 09:26:25 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21EC66B028F; Tue, 9 Oct 2018 09:26:25 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id CB6C66B028C for ; Tue, 9 Oct 2018 09:26:24 -0400 (EDT) Received: by mail-pf1-f200.google.com with SMTP id f4-v6so1102505pff.2 for ; Tue, 09 Oct 2018 06:26:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2smE7t1ubnM/aBYiGbsyFVtZBSQMbwLYlNYKOPwJFGE=; b=WCR4vMn/kaiD7TER1mfa4Ulb9gxW/b1cffPrUw/RlHSaSYTLyi+gbn7rIpiBBFVGVP 1H7wWVDV0eZFF3hLXTWrUK+iBi+s27wE0XSaqIeDOMiu7+8XqAfo22yVTv7L/8vdVnZZ 0LLf9LHvOFmE3eSS+Gy6UDFTy7gtWM7/x23A0RHVO4d2vxCJ8n3tfBdYUWMsNvMrz4Lq wOg0cRCacmZGX+70a3hptKxntV8y8GdLEyYScEjyBdqnZAFa9CQ1zxTnWOpwctg47X1o oYaWmexc3if7QnpKtG7rlxf2WsY7hWf/9muanOYokfGyDso9qMkDuMczYceV5NOnOsql X6NQ== X-Gm-Message-State: ABuFfojBXVoeLtg+p+MRv7I9SKGTF1/FlHKB9UaXbjN68JYp4PTNqAes FHP19cj+y4dyPlGVDMtfMiPPQ62O2Fppa0tkCMAHbZsDzNSx6BUBHNtAWIRtmnC3S23iQ0Dhrkt XKkORLNVL/a9TVpef5f0yGfGnciialAfjLm2UJb/RNYac98alNhL7vL46UFRyoAk= X-Received: by 2002:a62:104b:: with SMTP id y72-v6mr30209917pfi.113.1539091584529; Tue, 09 Oct 2018 06:26:24 -0700 (PDT) X-Google-Smtp-Source: ACcGV60c1zR0SO76leyXV4OlBaO5Sp7arX5oB9Mv+TrDeFWDyRo/cRcR5OOu/4rf/r76zjdCNzSs X-Received: by 2002:a62:104b:: with SMTP id y72-v6mr30209872pfi.113.1539091583794; Tue, 09 Oct 2018 06:26:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539091583; cv=none; d=google.com; s=arc-20160816; b=nxIEfIFQzonseoa0A2EpvG5lB91DOmaWI6FZiNK49OYuuiyD686Qe3OqEBRGTuDDau 7z1AhPxKNExQHpWiW0t1SksV9szthPzkrgQFFYU6Ge2ZOhA87vTes1Z/UZKW8hr1dDqd dmIAvBUFR35nxT4HMTWTMsJfImJOzJFtKTUAQl0+5mTlbgp8Jc+7caIhxuEBLAJKFD3I x6aAJqAAQtJGFSdC5E6Pk8gKFayGZVX/OwnUFdGY9URYNz6uou79nS0uYX9EUh/6wZWy f73AxkRbaBuFySviG/YG0Qj2vWJUYmY3JPLOrtX63AH1y0dRNdziwh4MltLWDA/wDdeE R8jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=2smE7t1ubnM/aBYiGbsyFVtZBSQMbwLYlNYKOPwJFGE=; b=ZklgH0J4hgxm6/w6ASzlbyht2I1hMkXrFFaVdYHQ4xPHriFe+yS9rhXADaPEbWOnQW f83oOWgwzfnMyzz/l1OqEoBagy7TlwBYSDyuDAk9aIr4dldI9Ak+9n1xoWHzr5HgzY5s RBArostReQE8WvL6HTG1d7UdaphQpwHFIDXFO4PpmJYwiwhzVd5qd0zH4pM4xZMn80sp tXunJLv00faPYjgrJl8Dtf4LLrQEjReYeloBxCtyQpfXhJCsApfGsXQ7yMU5qV4+ruKf KryRywdrfKK8BL2jwnuBqLVFF4ZvNBZMOik+nYfibHSiDH+SrXWPRVfikuoHS4k8rPp1 /z7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=Ad4Bp8Y4; spf=pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id f94-v6si24786490plb.10.2018.10.09.06.26.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Oct 2018 06:26:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=Ad4Bp8Y4; spf=pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=2smE7t1ubnM/aBYiGbsyFVtZBSQMbwLYlNYKOPwJFGE=; b=Ad4Bp8Y4dt+Sx1b+QODbLDE7jW qp3pnjRMZpzX4bSQV88DBJK7v7Lgn0m5NOQfgSEZCvvITTzqoNr+CddsojnVnWlmEsB32lIH4sHzz V24jwBHBDcpZ5eRtcvXvY0jubjpjqEwHaAILEnL8H+jHXN1JXpjhByXksdT2zV9z9X70sbeIkKtb+ mrUqpNwE3WbmPAOCLbhFHzWzP/JMJfpERrXPmznPR27oG3IOkfCR8U+dQDnvwDfUZiebEnI+OIUVJ XbQr7VAN3MCoQX4trkMweV2hHV8F62mxD9M+2yo+pc5s+DuTf0wB5b/EjlCp25EVPHcySO4Rh14hn ze/6Lmog==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1g9s1W-0001TF-8H; Tue, 09 Oct 2018 13:26:06 +0000 From: Christoph Hellwig To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org, iommu@lists.linux-foundation.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 25/33] cxl: drop the dma_set_mask callback from vphb Date: Tue, 9 Oct 2018 15:24:52 +0200 Message-Id: <20181009132500.17643-26-hch@lst.de> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181009132500.17643-1-hch@lst.de> References: <20181009132500.17643-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP The CXL code never even looks at the dma mask, so there is no good reason for this sanity check. Remove it because it gets in the way of the dma ops refactoring. Signed-off-by: Christoph Hellwig --- drivers/misc/cxl/vphb.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c index 7908633d9204..49da2f744bbf 100644 --- a/drivers/misc/cxl/vphb.c +++ b/drivers/misc/cxl/vphb.c @@ -11,17 +11,6 @@ #include #include "cxl.h" -static int cxl_dma_set_mask(struct pci_dev *pdev, u64 dma_mask) -{ - if (dma_mask < DMA_BIT_MASK(64)) { - pr_info("%s only 64bit DMA supported on CXL", __func__); - return -EIO; - } - - *(pdev->dev.dma_mask) = dma_mask; - return 0; -} - static int cxl_pci_probe_mode(struct pci_bus *bus) { return PCI_PROBE_NORMAL; @@ -220,7 +209,6 @@ static struct pci_controller_ops cxl_pci_controller_ops = .reset_secondary_bus = cxl_pci_reset_secondary_bus, .setup_msi_irqs = cxl_setup_msi_irqs, .teardown_msi_irqs = cxl_teardown_msi_irqs, - .dma_set_mask = cxl_dma_set_mask, }; int cxl_pci_vphb_add(struct cxl_afu *afu)