From patchwork Thu Nov 15 09:44:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Sheng X-Patchwork-Id: 998065 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=microchip.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wRNf2P8Sz9s5c for ; Thu, 15 Nov 2018 14:16:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728198AbeKONWP (ORCPT ); Thu, 15 Nov 2018 08:22:15 -0500 Received: from mail-eopbgr780047.outbound.protection.outlook.com ([40.107.78.47]:32021 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726892AbeKONWP (ORCPT ); Thu, 15 Nov 2018 08:22:15 -0500 Received: from BL2PR19CA0019.namprd19.prod.outlook.com (2603:10b6:201:f::29) by BL2PR19MB0722.namprd19.prod.outlook.com (2603:10b6:201:1e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.27; Thu, 15 Nov 2018 03:16:11 +0000 Received: from BN1BFFO11FD003.protection.gbl (2a01:111:f400:7c10::1:167) by BL2PR19CA0019.outlook.office365.com (2603:10b6:201:f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.21 via Frontend Transport; Thu, 15 Nov 2018 03:16:11 +0000 Authentication-Results: spf=softfail (sender IP is 208.19.100.21) smtp.mailfrom=microchip.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning microchip.com discourages use of 208.19.100.21 as permitted sender) Received: from AVMBX1.microsemi.net (208.19.100.21) by BN1BFFO11FD003.mail.protection.outlook.com (10.58.144.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.1339.12 via Frontend Transport; Thu, 15 Nov 2018 03:16:11 +0000 Received: from AVMBX3.microsemi.net (10.100.34.33) by AVMBX1.microsemi.net (10.100.34.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1531.3; Wed, 14 Nov 2018 18:46:06 -0800 Received: from server1.microsemi.net (10.188.116.185) by avmbx3.microsemi.net (10.100.34.33) with Microsoft SMTP Server id 15.1.1531.3 via Frontend Transport; Wed, 14 Nov 2018 18:46:04 -0800 From: Wesley Sheng To: , , , , CC: , Subject: [PATCH 1/5] switchtec: Remove immediate status check after submit a MRPC command Date: Thu, 15 Nov 2018 17:44:00 +0800 Message-ID: <1542275044-10970-2-git-send-email-wesley.sheng@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542275044-10970-1-git-send-email-wesley.sheng@microchip.com> References: <1542275044-10970-1-git-send-email-wesley.sheng@microchip.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131867253716909878; (5a93feec-e11d-4f7b-166a-08d09f1f276b); () X-Forefront-Antispam-Report: CIP:208.19.100.21; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(136003)(39860400002)(2980300002)(189003)(199004)(105596002)(53416004)(44832011)(476003)(126002)(2616005)(446003)(336012)(486006)(11346002)(81166006)(97736004)(81156014)(8676002)(50226002)(8936002)(68736007)(16586007)(110136005)(316002)(305945005)(54906003)(53936002)(6666004)(76176011)(107886003)(498600001)(5660300001)(36756003)(450100002)(47776003)(69596002)(86362001)(77096007)(2201001)(26005)(4326008)(48376002)(50466002)(51416003)(356004)(2906002)(106466001)(14773001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2PR19MB0722; H:AVMBX1.microsemi.net; FPR:; SPF:SoftFail; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD003; 1:RM4hW4UfMdSorir6ySdSoZVwKmXoyBIEA+/1WglL4x6w5Sk0KCcY91SP0nXkyZ7/T5gcyIWXMkY4ACjAZnIxBAlOgMBadKv5B/IolXj7Po7teprpRAtHF0/vxwbDXIcY X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f59d08c0-56f7-41c0-3101-08d64aa8b1b6 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(5600074)(711020)(2017052603328); SRVR:BL2PR19MB0722; X-Microsoft-Exchange-Diagnostics: 1; BL2PR19MB0722; 3:hOCtySvwlG/qeVQnFEdnR98+M/JaYPsitN0RPlZCW2zq30Qr62WFHuHPIOpnbVhKk/T3Rd31anJHYiFt8VkcqvertNmpfyIH40Si1DrZbqWaVB4/mW3NeL0mr6DPUQaVQ1zASPNiC+C96eun6UDjmSirIN0rm13GzWo3V0KK3h9MT8XyzXMe6pMes0exEQxUzdv4IwLVoI+enQNEc9GUBpCFn9AOlpBwyuxIZY9aizQAWKoC0e3cN/OMXdo/DxDQOyJBcoh//GU/XQ4ezIGoqnYf/xkDs9wrSe+JnprBag9SJcvPT/Hu5EAUBXfz5rSMwRliwn+8GvnUm61YKwnC5nStMV2foA8vTmtVYTtf6s4=; 25:iYfVxxOUrHuUStDmi4sJDyRGm4PKcfSicB0Bklxf3+1o+puDg7SRHcNwaeIw/fqdke/MFFudGK2HgOzicR2JffOTgWup4+1Bwhn2lmvizgrXCvwRY564otYTIg0/pLpTWR9yZjbgBS0p2H8i4QNmBDqYtykX6iw0GRi7aSHMtUYz+vqWqYz/u4h2tT1RD242VAmLHLYYHqcAhoFaAQruJ0tHiVTOPQfZAEelRj7cG5H1Si2dSsQFcII3UgY83JtddaExWBDikMHZphQYKtFr/X9qQgmoixE0LHdlpwx5UiEJe9M/eQ1hukxIpEQ4vQYMnc6KYkIyB0c+ln8eFTT0Ww== X-MS-TrafficTypeDiagnostic: BL2PR19MB0722: X-Microsoft-Exchange-Diagnostics: 1; BL2PR19MB0722; 31:Fah6fesNY4KYTzm/u1+QmUY9aqv+A2GuCY8v/JyDpKjtfdiVhB1USndT2qpyR1Fg08Mo9C7o6mHeuV7ED8uWFjneCB292kWSFq3dcBUfuXMHQymcCAmyQvGo94II2p+YK6F3LVJCPbt4J5pP/qcuLiS7Le0VsYJ3kuYtq/vSyunMxA1Ejj82vd+REqxOqfxOG9Gnm0vbUV/BjKgBYDzlk+bOiplNztRs2Q5NPI3/77U=; 4:y1DJ7mnltgkUheCyfGKiEB97S/RcBKhJ92jVD6vcsIVY0P98gOo3wcAtEFH/yVVTgdC/jIxN80yIadrJTvP+De7rQs3wv8Azb0OuzUXQ4pMz2o+2S8UhezMc77Yo+TZKJm6OSfQepWHavmoY5cZcZIwJP8Ht3AOMFBjgtqbKzCLpXdcsthDj5fEPzeql2tdA72kT3ZtmF/HWy9mPWZQvHTviwDwBBNHPjB56zyfu5ozkS0xUuTCNQCS43pEBPVeFbBuNjH6QYpO00secCcJoAg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231415)(944501410)(52105112)(6055026)(148016)(6096035)(201703131430075)(201703131448075)(201703131433075)(201703151042153)(20161123556025)(20161123565025)(20161123561025)(20161123559100)(20161123563025)(201708071742011)(7699051)(76991095); SRVR:BL2PR19MB0722; BCL:0; PCL:0; RULEID:(400006); SRVR:BL2PR19MB0722; X-Forefront-PRVS: 08572BD77F X-Microsoft-Exchange-Diagnostics: 1; BL2PR19MB0722; 23:yi4QLl+fFwehGlCAtplhtLDyiJtbnvwh1bRcqDVWLiaM2IVtvp/ffyot9Gb6hwv1ipR6gCufabj8YPj9d0QwW7cCZrVAce0m2v53QHYbOBcUdJ6ESvV9vArLQxsg80B7EimVIh+9ZfVSA0JsatE4HOdcB6Ziw2HJAUjH8FjVgFmCEjy1npWudTrOHv5NeDWalMVPMZmTDPm8BsoeCeG/uOrZ9bZeCdNE36ccVW6pQRTMGTdZm6LPSHZvGjloXxwlDIRrOUwk4K0Y/h5t9zSIJoZ9osk4s4/jd4wSjYB+yuz5DJJv41ROiXOGYAZP7iqsrQJY/El8b9HV1HNBXKohN4h1Je7bBqu+cX5BMYSMA4AFi7KZ/Exl2ld7InJetA/HYL4JjvIvMAMDi0gCSL8+hYvu5fYcfnCfUawhhQyYukvaYuJHCNoLlyfZnFjHnAFTgu3YFUFsB0CmzexrobOpLNoJZowv3r9xWFWYTomifBAPPnDleRH9CPO3KlXAuvyoBX5LNTkT41+gGs3X4Hq6HsoNLQ1Js+LOwi7RzjRVP6mFln3JvCPHUWfnwswCPyTWkNd+C44682U2QTeiq3mGv0hkiy6SqCiWuE1IGhffgPAGzPiVjnQS7hpAMQ/GEetSpkd0YpRtVcoNRZB4zYrWMHqEWxJjRBprsaQznl/C5zJgeKx05P1u+8v9plq3+XSzrgt6eXMp0jDXc901XkrBk8QQ33E6DNqevGNqEir8uz/j/UYSgb7ocnP39v83IjdefiKlPJN5HrCgaaGAs/+AYvrt14Bt6Jjrj6KRmV02zwqYt17tf49dYf9C8N6i2fVZF0e3n6kJhbWBWFJmkCbaWeSa1+ywQz0BL9s/6m6ezBMo24+YgNKZn2dUu0J0j6Cj4in5dTYdRQOEiM8WoqicusP+hkm2EjegejyzFFyLuZTyuFYf2Nd9URhreAdjkrFtKB0yycCGQSTxw/oyC6AYHQG65ZEfCyMx4dwzsNOCUojPC6JfqeWAclVJ7C8e7E5Ayr1joncwZ02gI3g++xEhlkDjYX0tkOAUPt7tLDyF34RoP+1a2Nr4MZxkaPj6l3qo9QttqcsSdo5MND+Q6CZcpSCqlinFMa7h4Wbn60GHbtc/ecUeDsOoLs8yyw3HFvp8D9SZmt++Vst7KTaT+yPbuA== X-Microsoft-Antispam-Message-Info: V4a9ZsI0uzknkr8lSs3tYgOMicNaxXPXjWinXE/urSZz7Q94kMB30Qkeq+ANK3NN4VFzHOt923pMWGtu0vXCDBFXPvwDRXmPw89Dqnh7TvjReziqbyZbx1ItjeZrIa6XgH58Fnb9uBJhbTMcL7NeWrpOAvgbu0Ir/i4u9705PmqKgtyb1fmKDCkZZZRVjGEprAC91jSXqX0wqqJH7+/6Quw1qLPqRIKTZsVCS7GbSbP6hMKbCD9gjnFWlIPDmAPEOlVGf7XCm1/CUUHGfqUfY4ggThKwNlvTl9l7G37tErZLOxuRnkwGYfEC2YSOFVHMUm1ZwKcoZpTiuspNnFeoCt/vXSwRAOCK3MUcFQiNO3w= X-Microsoft-Exchange-Diagnostics: 1; BL2PR19MB0722; 6:UZG3KWHDc4GFzGWn425dCw+Voewc9WurX2WkMzn01Sw4ppgJwJhB3SVnNNte43xjCVNzKiN72rT0Dfrw3W2ao8UKTamoHGxnY4kZClPQuBgN3AxdOqLVzcplPzt84s1nCTjYkUzIKMfcoAQbuqAGZWpggRlqUn5D0HED6Wuyea/hZwrlolIQCgAyeRhIO8xzbKqDlTVTvbbmvGxjdGZ5ZYGf2RGh0+zJwss3NNYxohDcMwv64sLxuRTBrfJU14aOw3w++M2U/PATGDpUp3U9mpc9+zklV0hZYGjhtYHu7tTKNvPmpFP1p7AB02KBJQOlLLeGeSxhPG28u2CCS8byBU2CV/1kcKgFP9MRjKUWCzhAuTCLaw8FeMGdVHMGOkjcdOKGp765DamoD1jLqHz6UPR+Pq2nU/di+4/NknewiiDt1EKX8LDuebr8YMiqNowtDW16mxiXNSwTK6RDjNtp3Q==; 5:Smry7zP4LElv8T5Culffp2e1l8q0OTLa459Dl3TyCCTVtnfU9iEy2yf6CCv9KXjejhJL+b+UZsO8Qu4H7LbSbo8GcNTNtD9MsIivvYrQ2VVBisNI6Nshn/YfuPqnxEZX0Le/5DHJS4667Qv4ZteIjU6hPS4lxjCs1aHDqPnuOx8=; 7:EnOuAN58eBVOdo1B+HjRq5Of8DAIlKsXQzl9J6e0eK+25NREgqu4OGCDMRaEUJXLG4t5r659+7wNFmIsUvUKOYvpdSHsXjTUaBChn7px0Rf0Ga7hSdGRNzev02tK+7PIxxU4Rzy1nkb+sbyFlx1C4w== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2018 03:16:11.4566 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f59d08c0-56f7-41c0-3101-08d64aa8b1b6 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[208.19.100.21]; Helo=[AVMBX1.microsemi.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR19MB0722 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Kelvin Cao After submitting a Firmware Download MRPC command, Switchtec firmware will delay Management EP BAR MemRd TLP responses by more than 10ms. This is a firmware limitation. Delayed MemRd completions are problem for systems with a low Completion Timeout (CTO). The current driver checks the MRPC status immediately after submitting an MRPC command, which results in the MemRd TLP that's affected by the above limitation. Remove the immediate status check and rely on the check after receiving an interrupt or timing out. This is only a software workaround to the READ issue and a proper fix of this should be done in firmware. Fixes: 080b47def5e5 ("MicroSemi Switchtec management interface driver") Signed-off-by: Kelvin Cao Signed-off-by: Wesley Sheng --- drivers/pci/switch/switchtec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index 54a8b30..d2bca2d 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -134,10 +134,6 @@ static void mrpc_cmd_submit(struct switchtec_dev *stdev) stuser->data, stuser->data_len); iowrite32(stuser->cmd, &stdev->mmio_mrpc->cmd); - stuser->status = ioread32(&stdev->mmio_mrpc->status); - if (stuser->status != SWITCHTEC_MRPC_STATUS_INPROGRESS) - mrpc_complete_cmd(stdev); - schedule_delayed_work(&stdev->mrpc_timeout, msecs_to_jiffies(500)); } From patchwork Thu Nov 15 09:44:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Sheng X-Patchwork-Id: 998064 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=microchip.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wRNb0Fh2z9s5c for ; Thu, 15 Nov 2018 14:16:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728564AbeKONWZ (ORCPT ); Thu, 15 Nov 2018 08:22:25 -0500 Received: from mail-eopbgr720066.outbound.protection.outlook.com ([40.107.72.66]:13344 "EHLO NAM05-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726892AbeKONWY (ORCPT ); Thu, 15 Nov 2018 08:22:24 -0500 Received: from CY4PR19CA0042.namprd19.prod.outlook.com (2603:10b6:903:103::28) by CO1PR19MB0728.namprd19.prod.outlook.com (2a01:111:e400:7b6d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1339.20; Thu, 15 Nov 2018 03:16:20 +0000 Received: from BL2FFO11FD013.protection.gbl (2a01:111:f400:7c09::107) by CY4PR19CA0042.outlook.office365.com (2603:10b6:903:103::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.21 via Frontend Transport; Thu, 15 Nov 2018 03:16:20 +0000 Authentication-Results: spf=softfail (sender IP is 208.19.100.22) smtp.mailfrom=microchip.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning microchip.com discourages use of 208.19.100.22 as permitted sender) Received: from AVMBX2.microsemi.net (208.19.100.22) by BL2FFO11FD013.mail.protection.outlook.com (10.173.160.221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.1339.12 via Frontend Transport; Thu, 15 Nov 2018 03:16:20 +0000 Received: from AVMBX3.microsemi.net (10.100.34.33) by AVMBX2.microsemi.net (10.100.34.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1531.3; Wed, 14 Nov 2018 18:46:08 -0800 Received: from server1.microsemi.net (10.188.116.185) by avmbx3.microsemi.net (10.100.34.33) with Microsoft SMTP Server id 15.1.1531.3 via Frontend Transport; Wed, 14 Nov 2018 18:46:07 -0800 From: Wesley Sheng To: , , , , CC: , Subject: [PATCH 2/5] switchtec: Set DMA coherent mask in Switchtec driver Date: Thu, 15 Nov 2018 17:44:01 +0800 Message-ID: <1542275044-10970-3-git-send-email-wesley.sheng@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542275044-10970-1-git-send-email-wesley.sheng@microchip.com> References: <1542275044-10970-1-git-send-email-wesley.sheng@microchip.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131867253806051843; (5a93feec-e11d-4f7b-166a-08d09f1f276b); () X-Forefront-Antispam-Report: CIP:208.19.100.22; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(136003)(346002)(396003)(376002)(39860400002)(2980300002)(199004)(189003)(450100002)(4326008)(68736007)(53416004)(5660300001)(305945005)(50466002)(97736004)(105596002)(69596002)(2906002)(76176011)(81166006)(81156014)(51416003)(48376002)(106466001)(26005)(77096007)(107886003)(8676002)(53936002)(50226002)(498600001)(54906003)(110136005)(2201001)(36756003)(86362001)(486006)(356004)(47776003)(6666004)(44832011)(8936002)(316002)(16586007)(336012)(476003)(126002)(2616005)(446003)(11346002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:CO1PR19MB0728; H:AVMBX2.microsemi.net; FPR:; SPF:SoftFail; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD013; 1:zUCnw582eV9wkN8PtbbtPyYIY2eUDUEqDKM0w7g9SsR77ws3JGnLCI6lgupGDcUJwzcHEBrsGA5srXWoN+sAAovqJjLYFlsZFW2VtpE7ctUjh+s97xBSWcLWnp0HXctH X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e846f9d-8af5-48b8-c609-08d64aa8b708 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(5600074)(711020)(2017052603328); SRVR:CO1PR19MB0728; X-Microsoft-Exchange-Diagnostics: 1; CO1PR19MB0728; 3:pk20Ybys/+NjUhzpUfK6drZbcMmlA/pwYRjxlBcHaJm/G2lAK2DJPLoU57B30+f2qmGoBE9bPZQQGibDABmvsKmBTnlbMPzYy5FI5BS0Bq0dHtqmFFIVuaTA8GAMjDDTn59qkzlswl9XVtPTTonFkuWinMplNT9IEAeu2MN0XvvlJ3xx+uesg+mH6awTTG3VkqJXlrdDt2Gc/1CC1C+zI+ZTuTFhJOysirC6j8J46Nw+wFm8XKmzg+WbcnDiriXrjgV7bGpJfo02ENunoOSJE0WFpI7T/vpdIeWNVG+dkKXhvAKaxm1l/Gw9wlr5ls+12D/5JK6ElVfsuaqRtLJxNuB/Lh5HDCLTOlc8TfbW5gY=; 25:p+1p5aeJ36kY+2+Ut214TenqH0oX9askLorZWZOzuVjtjl/7vA9qxwzoR6/hoe/vDWfO6umj4RdIiI2RsOTLHicqECUwU9Nx8tKhQBLAgYL+8NEUNdk49PECNo+3YS/kCc1SO0ofSK4MTIUC6kLbE6ZL7pUH5qQfR3ad2yzjfFabIg8Mav3ogiThmFDXjLwMIF+kgAI7OvYNwOjHJw0ggXrnVujUJnDzsfWVz36nD2lx/YaNSAAspRt4/26QBqQT75rWQGNPkWLxsqfMDEb8Ag4vktQNRV+0Bu5x0KIjiw3Mbi3irJHKeHMDvKL5OeVtkHF8GK3sTDO2StQNsRXA/Q== X-MS-TrafficTypeDiagnostic: CO1PR19MB0728: X-Microsoft-Exchange-Diagnostics: 1; CO1PR19MB0728; 31:qzwxOlpSgmlXASVLi6P71QWxyGx1rk7gMqAducEfWdwx45QYU6FeMAu1Kgsc/RrcksvV6xZLrSmlXeOagJuJG6AXPs6FrjvsYyUrcgmy0HJ/JN7xsCxSHnN8g5mze+LRw+TGaHDs6/GfZSnkLbNWzP+peeJ2TqHTDRqIJ2ttklVsi4J9ZFgGkNGp1bjD11m7WoHMQGDiMOeus5UdQbPC4nICZKqalUhMunbvJPkVSro=; 4:u/wuVY8WqsV8eo+mnL+DbKCt1DrCARsHfAEqs6DIKZwcaI9kbW8nnwQqGuPDrC2MkirfLFo2Mj48tSLR1kUqaYaoxVT8t45t15bH+PIXkb2yOQpqFOEsRC/1bmWsGvWOwL1PT906C4fKRvLnCDC028u3XILl1kr734CI4bh4tyPgnmp3b8FjWRGwPq5OaNhcjtcKOSHumxASmHwmDwCr8JGVy3yyu1iV6SI3oiqjthqd/+xrQdbEJfsoE9DD1tKdNvUHDekH841xUj9TkkdyLg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231415)(944501410)(52105112)(6055026)(148016)(6096035)(20161123563025)(201703131430075)(201703131433075)(201703131448075)(201703151042153)(20161123561025)(20161123559100)(20161123565025)(20161123556025)(201708071742011)(7699051)(76991095); SRVR:CO1PR19MB0728; BCL:0; PCL:0; RULEID:(400006); SRVR:CO1PR19MB0728; X-Forefront-PRVS: 08572BD77F X-Microsoft-Exchange-Diagnostics: 1; CO1PR19MB0728; 23:P71ZxHs7aORj/kHBYmG1S+6JHmIGDBlwubRUx8PhKITfn/ceLern3oOVIxfP9sVC+d4ow68P4UsOO+1SPe4Q2HTuuau7cBzncBYM19eWWBsEm6nUFnFWLguaL7Yyn1UMG3r/cpVCfaHKnIdPT719oD3wxX+1mdSST+LIujduFWxGwbkO+pdJrDdcANSm/2X1xhoWPSaaIsfQsghp+fYaUKPEYg+WR9bRsu5jYBO3kJJ8b/JCmITJkWGcyYDMWKPq3OrQud+Vrai5qA+PLo/DIZOtqTsiNzF8gFCPRVt7ADVabsw9R5Wnt8jOm0MBOK6UBdxnBMeTL8XJFa12D+MyirnuNvVdvjp8e2ST+KhYBiCDGbsOiQnWGm0nrKl4aRFvWEm0yu6lrH2pFq7lDhxnGJs853G+0MbY/wgE8sITHSa0x/AwINky7BGkcYq29Udy+n5hZ+vliMgQN87Btp3fYe/JjRooDwp5GvbILmQU3RrpgvC2svO2zBtkzQikaZUAf6RGL203j25rG04FmytmvMooxAh1H0EhkfX6CEhSWK5hkLHSVAS7BLFbV0f2bEc4DDzW8UF0FLCjpeU7/qe8KuBI7Kp1arQu4zSVmu2hoQO/NlIfn3LSbWmlzji19kuKERG0ukSZnuaHZiSQQ6KX3r/ttnjSmiTNbLBQKi37xW86xdloKHuPGsdkcSmDp1MM4r+fYaUkroTFKaPtdbKEqqINBe11EI1b8xB76oCnwiSemScMfGJIlNDPZkTOO+UfXv+HiY9x5kR0XpkAEJDfez41TnD+w+M0342yhiVhzuTwq9zkSBdtdlpibB5q42zwNxCippeyPMs9xzN43CORgmBjt7la+n9RVyVXayFv+M+WSoNoIjMGpGHmFWbxMS82wAilOeHcTHgKod1qSXYxoygrOL5o0NAHaWP3nqI9/5GGUnhdxta90xQcTuFolkN6Vep25I4v6BX4a7kNnC8LinalkacJ+WFKsUOovPZs0MC6dZnnyb341kPy+4sF2msbhKvk0QdVIiyqzm2OKYX9GNFgVmSJxONPQTogrRKPvE5jaXQBVsRhYhKckbGoogOPg98NK03u+lt9vH5AD+PzkkVJ4rhEV97JeoOOzBgUJ7cHC4duYXrzWxSueTOuD7v6rxRUCoL86EXMsivpc1k2bSYOFzjvCd8KqgmDxGz0kuxLslOhkj7nRA7U/l9kP+zLZ88EK+Q5L79YQQuS8AFft2RwiFb4b1T84davpbu1h8w= X-Microsoft-Antispam-Message-Info: 3jyryzN1Ot0Of/4MHS0uOnzUl6pUerRtbU2TUuPBLT9PAVjD+D9KAvu8dEMdc1gv4BUERG3lF1XOstN0IaaEi0H51NZzTCNwujeQTHRJUFMPfNOeA8OChRXdv1qvoct0nr2XUXo+VepOIrmbeHBoG1RBCf8cnpLD3rcPR6KM2Jh9vCfeXeVD0YQknPAm1jAAgBWvrNk+Tf/rndlPFTlChUBcWVFdDQjnVKJLBCke77YFd7bXzTUpXliRKLDF9ze+YybpbwPKU72BrSMfuQI6xYcKedy3cARuVaEykLMtNXvzmYFs1d/aUkYhRMgioWZUSgmgF7wZ6N6n8Iqe6qJkNs1vwUwujDRZ5PsKE6MUaW8= X-Microsoft-Exchange-Diagnostics: 1; CO1PR19MB0728; 6:WVWEMhXpZ2nKJlRtDcz/ysSpIp4EpMZDNU4kJSsIO5IYjOt/9HYqXBFDGyJmtFJasrQX678Edppu+x+85lgWtjuI6cchRJFt+S5+iJOOOGx+fP8H7vtLO90IqIf1VYytHQu/vQryROTqEBJtWLX+Ja77zlwvLhWHeKxYja1sqKxSydTBAR/CopuP2rPXKezyCumFohKUcmpgkhghAka2ZMOAn3Emr6SuzaXiJHsXliahRtZI3U9wuuZL7Kg/+P3RwSKj0Y7SM4e78sgorrWq2dSyQYDvU+AMwT9SEydMrVBtcB1BJKV3KTKmoK4Z6pBGkXWU8Ba1WpWmgXTpdAIeICUMPE2sHnwrgmjSEKBjWJUVyjKfTOouisCjLFg6qs5mFbhoeQjYkp/X1ynMZ3i8D0u54sgxQatflPL47DJRrKT3GhG32jpvha7k4p5qw53BGt1ckywU0qdKL+oVkiH8RQ==; 5:PqFfOeVvWYPvNmiemsTWRNVebssiTqNVvAKUL5Fgy4AA8wy9S6evBhaypreds3ILwsTjtsWUqqf0B24amLMTJBxbmxxgDMNML1w17qUe0rwW/I+zQHs1YmWsBAQcX7XhZU7ESpmnz/sBECiFm0J1F8h3wVQbgA1kTHFRsJkOlf0=; 7:ITRRFxLkOjYB3N8ROkUZCSiREwACBXCeZA7T77t+9G11aR4pe5tJ+gdiVsnzZpPg25WAgsbOq+N9YNGhN1ICpTvz55TaLPDb965VC3MW7BP7WeEDwE6YZDALsXP2PkuNxf70xb3ZBYDeCP32wuIqdQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2018 03:16:20.3864 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e846f9d-8af5-48b8-c609-08d64aa8b708 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[208.19.100.22]; Helo=[AVMBX2.microsemi.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR19MB0728 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Boris Glimcher Switchtec hardware supports 64-bit DMA, set the correct DMA mask. This allows the CMA to allocate larger buffers for memory windows. Signed-off-by: Boris Glimcher Signed-off-by: Wesley Sheng --- drivers/pci/switch/switchtec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index d2bca2d..480107e 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -1237,6 +1237,10 @@ static int switchtec_init_pci(struct switchtec_dev *stdev, if (rc) return rc; + rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); + if (rc) + return rc; + pci_set_master(pdev); stdev->mmio = pcim_iomap_table(pdev)[0]; From patchwork Thu Nov 15 09:44:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Sheng X-Patchwork-Id: 998061 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=microchip.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wRNK6cnwz9sBN for ; Thu, 15 Nov 2018 14:16:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726892AbeKONW1 (ORCPT ); Thu, 15 Nov 2018 08:22:27 -0500 Received: from mail-eopbgr800052.outbound.protection.outlook.com ([40.107.80.52]:48657 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727341AbeKONW0 (ORCPT ); Thu, 15 Nov 2018 08:22:26 -0500 Received: from CY4PR19CA0042.namprd19.prod.outlook.com (2603:10b6:903:103::28) by BY2PR19MB0391.namprd19.prod.outlook.com (2a01:111:e400:5a2d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.31; Thu, 15 Nov 2018 03:16:22 +0000 Received: from BL2FFO11FD013.protection.gbl (2a01:111:f400:7c09::107) by CY4PR19CA0042.outlook.office365.com (2603:10b6:903:103::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.21 via Frontend Transport; Thu, 15 Nov 2018 03:16:22 +0000 Authentication-Results: spf=softfail (sender IP is 208.19.100.22) smtp.mailfrom=microchip.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning microchip.com discourages use of 208.19.100.22 as permitted sender) Received: from AVMBX2.microsemi.net (208.19.100.22) by BL2FFO11FD013.mail.protection.outlook.com (10.173.160.221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.1339.12 via Frontend Transport; Thu, 15 Nov 2018 03:16:22 +0000 Received: from AVMBX3.microsemi.net (10.100.34.33) by AVMBX2.microsemi.net (10.100.34.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1531.3; Wed, 14 Nov 2018 18:46:11 -0800 Received: from server1.microsemi.net (10.188.116.185) by avmbx3.microsemi.net (10.100.34.33) with Microsoft SMTP Server id 15.1.1531.3 via Frontend Transport; Wed, 14 Nov 2018 18:46:09 -0800 From: Wesley Sheng To: , , , , CC: , Subject: [PATCH 3/5] switchtec: A temporary variable should be used for the flags of switchtec_ioctl_event_ctl Date: Thu, 15 Nov 2018 17:44:02 +0800 Message-ID: <1542275044-10970-4-git-send-email-wesley.sheng@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542275044-10970-1-git-send-email-wesley.sheng@microchip.com> References: <1542275044-10970-1-git-send-email-wesley.sheng@microchip.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131867253824645354; (5a93feec-e11d-4f7b-166a-08d09f1f276b); () X-Forefront-Antispam-Report: CIP:208.19.100.22; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(136003)(346002)(2980300002)(189003)(199004)(36756003)(68736007)(76176011)(450100002)(81166006)(14444005)(81156014)(8936002)(47776003)(8676002)(69596002)(106466001)(48376002)(105596002)(53416004)(26005)(51416003)(5660300001)(77096007)(4326008)(356004)(6666004)(2616005)(126002)(476003)(11346002)(446003)(54906003)(16586007)(110136005)(316002)(498600001)(2906002)(2201001)(336012)(486006)(50466002)(97736004)(50226002)(44832011)(86362001)(107886003)(305945005)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR19MB0391; H:AVMBX2.microsemi.net; FPR:; SPF:SoftFail; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD013; 1:Z9DPm2A86bSz5lyGZuv7EajNJc/xR3WZbkRlRzumGWRjB3NNjZwa+SYmMuW/Hpy6lp4p3n7mrmy8IYo/4Q3hIEjinmtFyHplG3C8z7hgynnOQNuBhAcpPr4SFB96iETO X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27747807-949a-49d9-68ea-08d64aa8b830 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(5600074)(711020)(2017052603328); SRVR:BY2PR19MB0391; X-Microsoft-Exchange-Diagnostics: 1; BY2PR19MB0391; 3:pYRnvqhS6DyMc/4jlrIVC6dEG4h3ReZYJkXyEZSddF41Xxp1h8Hui9hWAEQIQYE9u+7tSpVVps0ZNE5bHeS+7GYbueqgr8M4pzeBOIsnzqKtrMMXc1hAbsBFwDcEawxT7bi66Z806qsBJjutpA105cCSJ/BRTUAFl07j2ofuk5VZEq1H0IxMflE3vMP4iF/2NdjtwnZekyT7pOr7gIVqVV2Ox4H5jAasiO57ixxCf9lmF+uzLUvpfQIvB+Aop8emEeGmemi5wrT2wAQVIMXudxdsfyjhhB/Nw5PGT0FJP1Wd1p8X65PfF307R9ou0gOe01xvoqdnFXdGh5hKzwCSejsA9Iz7bBECuzv49H4UuyI=; 25:x/+qKpuR+nABOuAu2qYjpNpjVUI5jxXn9++U7cw3eN6ax7PNIoQIE3qydpYiiVsiPxDqlpRkvp5v1d2s8bI3/Osj7sqg29DJWJs8HUw7UFJ8fniymY6schFWMVR/VHYV35kC6PgmNF3hzT6pEHwOvQ88Fyw327J5c1iTVTUz6mD/5ZuuGj958rQoq3TBOKLhs7KRmfrJwdjgI7Ze2kpxbmhlkw99ZLl94elx1eFigT12goMRb7LZRH4bfMd4C3ZLi1YqhKTI/nQ0KmEBlclhr81e7pBzCirUpTFvPozmKH2WCOZPjcfJKpPOohqUCxx2S9i1rpRLi4rTI+MhFerrSH4/CCsA3mz5byKn509Ogwc= X-MS-TrafficTypeDiagnostic: BY2PR19MB0391: X-Microsoft-Exchange-Diagnostics: 1; BY2PR19MB0391; 31:6TH7XeyEHeEoelICij7xccbr9hW2XuDMnwof3dPOvh2N2zMGY1YK5bQeF78fgC9Aj6Bw09OatjOWNhRHP02gZovSi9hgG/KAhdVQ+X4pm1b5jOMzYnBIBmDqtTyqqpXqbV9DoezQPAsDDugEBfItQu3yN6ItEtgN2LhqKpOSLgac5hbb77A6dcy3wR4+4bSe7SF8Ir15CtrFzIctm6xg5AXD2JFeiwFcuQtchC2EWsI=; 4:+8rKQnuMaacFRrkRWWSFiC3WyylFaBTFnBvjI1FoqZadRKDC34aufIjDexmy3NvmrCd9JDAR4BNV6mo8yRocwq2Vgkm6cTALNTfhuLyMK2bhedQjSB1j+DHjhPKxwGja5NhbM8T5FUyf+iRFJyci4xOENuU4moFQJ2d8gOQBWdnxcKB5nHXc2De/b2wSyTlhQxFfNI5YWOANFLE8LUp7CGBH8xWGZUd8jYVKMwKSmH4McjAT6uLF8xbm8OZEh7bm/ngj9HZNc1f9ko4CleEvuQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231415)(944501410)(52105112)(10201501046)(3002001)(6055026)(148016)(6096035)(20161123556025)(20161123561025)(20161123565025)(201703131430075)(201703131433075)(201703131448075)(201703151042153)(20161123563025)(20161123559100)(201708071742011)(7699051)(76991095); SRVR:BY2PR19MB0391; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR19MB0391; X-Forefront-PRVS: 08572BD77F X-Microsoft-Exchange-Diagnostics: 1; BY2PR19MB0391; 23:rRNfBOHa0yzOBEaQl8xI31xitw22eKhiPcnk0t//PUnGbegP7MFXz8VSUnDX39J33MEMwxamlxr3UO8iwQOpaRFk30JsDjQlm6HIKI8cVmD3L3ZW2cu5H2mZbwHBWogk9VGaQ2tEqgiEvtB//p0szz91iQUL5it+mtlHddbLhf73ChyMWouTCTL8FlwCxAzg/S/pKnZLL3e5BgXuvZolAOQfpmvaqfxrNsaJREmZC/pQEr1U3HBEyjhLxG32xiOBDLXZs1+25QGlty26aEdp0eu0tnN/EhN8iHud21fQYEDoYKyxiaVe2ZLCaC6YiV6nMiysMkc0dEcsfslzxSm3MVNF5s0pvvodLVViTL1/DXavjtMT8ESnpNe2+YL2lHt4MWxbKKBD+g00em7bdW3+SPP1iIpxwBvoOS1qlqk3jY3UMRzubyxdZnx2cUvebdQbTZRSRdQrp3GunG24sW21x+ULgPK6OK3DYKbvh84c3B9fgw322IlC/SVdQ1SMzLisGLyIZQ3zkBYgJ/ozj+OsL4SR2BHtk+SkxokGlhI0VtFGTpwvp7Ft6UelVe2OR2AEgcnxIZ1CsUgsedCS+ipuLA5cZlwaJB/Sh00S2Aq6p7xjCrbANV7k3yb+jynXqMq8iaTHT+pZerrcPL5kdAZiuGVZsEW+JdGjD8bvWvq6eXC36FVF/lzLcb4A6WBF6/Ybh1+ZMK/q5/5KSjn1d09qy3I6rLj/gWevnBUtozLg4YadoTwe681/C7CtNgATvODJMsPmD4lIBAA+kLS24fQX8z35E2ZKkQs/5qqaiPLE/DAyjRiO6TZzVbcpC0wLHDSY7cibBNSL7QNt4zHNu58tAIxznyP9egmuuysCWzInVQH9qmmEN9lA8KlZN9IFLodOkVvtGcl11QIxEym0YePaJ5886kWOoHmFkbKpzyoS2GdNTncOIPAx15QaTbU8pBnU51kgeR5ijSA/U0EyQIbuhfT8mgaZNhxGJgtLgIT6iBgtcQ9Lp+NV5uaK/9SbhcJT8hfiBv5Dnmw+pkU5l3C2t4Y3ap5FJKmqm64+50Ogr3rxwis8W65E+0TzFoptbXOkjpUkDw4DnuYv8+p0TMs+m1WAI5qs/iMZ/1NTL79eZ9MkUaqjsBr5U7COB2TdWiGeCuH/cmmFHfTNuXGKw7Gmrg== X-Microsoft-Antispam-Message-Info: J9CdxYmSz4ILTD8sK+1d6wOTIXR0z4y69Z92OQjikytg6/JUZlJCCKiQCOByBY9pFhSMyCxxL0yFiVzaJxcdtk1cZnHh2MVN8kABnWqZZnx6UD2iB8HWJepjedpy008F+GcCg2DDvluWfsTq4EhEDg6+jEXJCA8/V9dhz6MOUwoxUDJhupjOj4ghI9j2K+SeVNOOTchns2baaAl5rq3GT7uwznn07SZ9Pd7FxLJOJSMezJb9Ko4TJcKyhSNlMtxlFPb+thJrOwaNHIuzxo+WkLG8BwAbq3+isBpesrvqA85ot7iSYSUFUTR83pJIEwyh4WjU6ykO2vvlKUfPCWkp3wC/C+DqVAqKL5a7RYjDLkY= X-Microsoft-Exchange-Diagnostics: 1; BY2PR19MB0391; 6:CM63XW7Bm9eGLyirUNz+JLt7oIf4Cpc2qII9e2cgwn3aDRqIvCg1LwVeis99hXCEdXW5CKgFVtPqsebYbZ9GNJp6lB71gT5CPSQmajZnj5poZbRcRICXRU7WONVR1xQaR8q8oUg/3TnT8jL7eefcclwTrO7gFqzKTcpOfUm5S3Wal++OINkUx1kpBZq3bBVtyRlmuukrMN+/FVr6I3vdbevPDdAsu+POsFTA8f7oruBmNV1y1wnfdyRQrHPnF+PkcqBQIVUzvRNxwTVem8FuaN9fYcmrtOSGzSsQ4IUWX1Uz4EQk90kFQBWRKXZgARwr3ixHP1T9U5GNQo8FYEtn9hSiZBWfa/OoFdW9K7Cr3ReK0QPXxOHOtQ25k85uWy1mbAAimYzFE7usGsW+EN0TOx4xpNbqfBDISxH9vDdNaHsJjPa2jMiZINRUHliohQNVU24+YfpaS7ncKG3FXhd7Fw==; 5:kpDMXf/JA2PGtXWMO6y/3ScLBE5eWD7DcwwWZEhGvzjr6/N4qjpDblVgPwHelGGlC+mdhXTjkviMWK3Tn7+Y2TEGF99wSCdQurC11N44/XUGny0Jrot5nqvXTiAhfCHtAMrBc99U3qvTrFOFCIrmCcFh/sQhtd0d4qq1vjv0nJ0=; 7:TsZpMKJEOzmzb31ez2RdhWP67w2hs5UgcHXsrP92ng+Nstq63IWX1EOoNhi7LkHkkYI/steThYDujqBzJV5HKxrgihMrmd1u1bSFfxwlbqgc7ZxaMTjxTp9jCSfe2R4Ry9vHh78ftwOp2i9oEljwdg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2018 03:16:22.3239 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27747807-949a-49d9-68ea-08d64aa8b830 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[208.19.100.22]; Helo=[AVMBX2.microsemi.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR19MB0391 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Joey Zhang For nr_idxs is larger than 1 switchtec_ioctl_event_ctl event flags will be used by each event indexes. In current implementation the event flags are overwritten by first call of the function event_ctl(). Preserve the event flag value with a temporary variable. Fixes: 52eabba5bcdb ("switchtec: Add IOCTLs to the Switchtec driver") Signed-off-by: Joey Zhang Signed-off-by: Wesley Sheng --- drivers/pci/switch/switchtec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index 480107e..a908670 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -796,6 +796,7 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev, { int ret; int nr_idxs; + unsigned int event_flags; struct switchtec_ioctl_event_ctl ctl; if (copy_from_user(&ctl, uctl, sizeof(ctl))) @@ -817,7 +818,9 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev, else return -EINVAL; + event_flags = ctl.flags; for (ctl.index = 0; ctl.index < nr_idxs; ctl.index++) { + ctl.flags = event_flags; ret = event_ctl(stdev, &ctl); if (ret < 0) return ret; From patchwork Thu Nov 15 09:44:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Sheng X-Patchwork-Id: 998063 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=microchip.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wRNY3r5vz9s5c for ; Thu, 15 Nov 2018 14:16:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726689AbeKONWe (ORCPT ); Thu, 15 Nov 2018 08:22:34 -0500 Received: from mail-eopbgr710066.outbound.protection.outlook.com ([40.107.71.66]:6113 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727341AbeKONWd (ORCPT ); Thu, 15 Nov 2018 08:22:33 -0500 Received: from DM5PR19CA0010.namprd19.prod.outlook.com (2603:10b6:3:151::20) by SN2PR19MB0735.namprd19.prod.outlook.com (2603:10b6:804:29::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.26; Thu, 15 Nov 2018 03:16:29 +0000 Received: from BL2FFO11FD006.protection.gbl (2a01:111:f400:7c09::168) by DM5PR19CA0010.outlook.office365.com (2603:10b6:3:151::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.21 via Frontend Transport; Thu, 15 Nov 2018 03:16:29 +0000 Authentication-Results: spf=softfail (sender IP is 208.19.100.22) smtp.mailfrom=microchip.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning microchip.com discourages use of 208.19.100.22 as permitted sender) Received: from AVMBX2.microsemi.net (208.19.100.22) by BL2FFO11FD006.mail.protection.outlook.com (10.173.161.2) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.1339.12 via Frontend Transport; Thu, 15 Nov 2018 03:16:29 +0000 Received: from AVMBX3.microsemi.net (10.100.34.33) by AVMBX2.microsemi.net (10.100.34.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1531.3; Wed, 14 Nov 2018 18:46:14 -0800 Received: from server1.microsemi.net (10.188.116.185) by avmbx3.microsemi.net (10.100.34.33) with Microsoft SMTP Server id 15.1.1531.3 via Frontend Transport; Wed, 14 Nov 2018 18:46:12 -0800 From: Wesley Sheng To: , , , , CC: , Subject: [PATCH 4/5] switchtec: Improve MRPC efficiency by leveraging write combining Date: Thu, 15 Nov 2018 17:44:03 +0800 Message-ID: <1542275044-10970-5-git-send-email-wesley.sheng@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542275044-10970-1-git-send-email-wesley.sheng@microchip.com> References: <1542275044-10970-1-git-send-email-wesley.sheng@microchip.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131867253894595531; (5a93feec-e11d-4f7b-166a-08d09f1f276b); () X-Forefront-Antispam-Report: CIP:208.19.100.22; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(136003)(346002)(396003)(376002)(39860400002)(2980300002)(199004)(189003)(8936002)(2201001)(68736007)(14444005)(6666004)(305945005)(2906002)(498600001)(107886003)(4326008)(8676002)(48376002)(50466002)(53416004)(356004)(105596002)(81156014)(81166006)(106466001)(36756003)(5660300001)(53936002)(50226002)(450100002)(76176011)(47776003)(44832011)(51416003)(86362001)(16586007)(2616005)(316002)(446003)(476003)(11346002)(69596002)(126002)(336012)(26005)(54906003)(110136005)(486006)(77096007)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR19MB0735; H:AVMBX2.microsemi.net; FPR:; SPF:SoftFail; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD006; 1:L4Wj8xShy8vT9Fnk+Ozw5u4NpZSGoOOmo67WMgNk+YgIgEWKi4Ziy39rozrcLq0s0wKG5iFOYU2BGe6ctXw2RNO3SVcvTwl/ylH3lVE0H3WkWeCi2M/0WnAKrEX3L1O/ X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e74a889-0b8d-48bb-b1c6-08d64aa8bc48 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(5600074)(711020)(2017052603328); SRVR:SN2PR19MB0735; X-Microsoft-Exchange-Diagnostics: 1; SN2PR19MB0735; 3:aKpxvuLkjhyhxKy9gHMNz19TsSgKN/4jijHxYF27VYkz8v/js5ME5vgPxYggf9LZUKl9lG8lcE4evToc+BvNi/oJ+WnxT9rGxFhrJ+KEXhDhN3jgBLnu7Xf7K9A9BIXt+kfy+rhRxSvPzxwyoG7oSyOCjk6s7NRZoNyUX/en25JBicgLvLZvDfJYEs1fHJljlwyV/pt6ajsa8p60F9Oe8AHTS9sjgX7vNfFU03AHI+JGLpSiPBZKhi9A9SAq6ZQVg+dQz2YDYjoPOiGUfhn3Vsb7mUAsQWThCaS0XTZutPkv0f17lpjMbeE6NcoWCFKA4IxyKYr54z9IEVgKd4ED2gInXKj536CFqe2oAwaDHj4=; 25:Q2d3pc/jqRfN+5flv5VrVogYq66KZ3/wQ9llfM7JczL71pWygagLkI8O2HjsoeAckXL+xTNrlygj89+VzSctMvrRvZb9GrVq5o9/eQgB0CCjbMIWPWAWttVddNcNTQ2y7HizAPFhWrmQSNErJ9hssZFmZAbiFxonpDdF37BbnvGMVSS+VPtlNShOV3ItMNTNEUNVS9ABOuk2IoKJ71G3AC6n6o4JUKY4Dq2pDt6rMCF7E7vSapot318F3+ghrzzczRJCLri3W8kZGaP0rAIF8qXppzKzytZg0mkAWV6z0FptnvVCdTcF6YVUFAwbmkt78aOxpwbeiYGrWS12UNr7WQ== X-MS-TrafficTypeDiagnostic: SN2PR19MB0735: X-Microsoft-Exchange-Diagnostics: 1; SN2PR19MB0735; 31:cCVvEQxoOVKTY3etDU2i50VUUo8oy5OosFQqUuikyi2Y2cVShZIff9n4MHnbWeymohx8ttMnhOlFKQjSehEzFdVIrMSlB1zCoWdx2+LmF4yV1nMjqTzEuzQHoksYjvDJR4KdTMMK0Eruy/XRGe+qHNGVOaYs3YR8TJ3OmxS9OndvVmNFog5Ca2+YsrwQQ0LfU3XlwgRF9QoOlf4LA6W7rK0ikgY6GOAds4p8YLMe4qo=; 4:wZeF/Ffrbs5B25u2R9qiLzTx2MCYq8auMF5mLZ+nUsQILEUG52XJYjRjw9Sr0OWXpbwtgop+Ii2Wj7KQYemwi1+4X9XAfGXcVAbClX6o7tddrqqnW9ACxpxb4LQf7lgI1ksgYSntwbNPulaPCdnABf36lkyFORaaPsP2tBhe2BHWdzlotc+z4t+hokmGxdr5a1+i+5jl4RgHw1VDQyoRTX8HRR5SKL5gPWHL17G8oNEFt6NSMp9MFdnc02+ZwZTgH87j/zf2EBMFyCMZaRnTlw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231415)(944501410)(52105112)(3002001)(10201501046)(6055026)(148016)(6096035)(20161123565025)(201703131430075)(201703131448075)(201703131433075)(201703151042153)(20161123561025)(20161123563025)(20161123559100)(20161123556025)(201708071742011)(7699051)(76991095); SRVR:SN2PR19MB0735; BCL:0; PCL:0; RULEID:(400006); SRVR:SN2PR19MB0735; X-Forefront-PRVS: 08572BD77F X-Microsoft-Exchange-Diagnostics: 1; SN2PR19MB0735; 23:g95BZ6n1sW0QpA8vZB/a1llD4T3k1GTYkv+HedDm90hYore0KvP6KA0rxTd0TZBhQTfaRk3fSpdoKSnqaV91S7Ba1748LYg389zElWs/Al+eTwDZ5ky1vVzz7D55hAD56Fv7qIrEtAhmtyCEaHCZKx1cYdcpj44NeX9AQqw4Z6bEweBDVxbJblPjn+SWoj8Jnke9SNEIK8E4WZaH8uR/Tl3h4iTLp2K9ifrMZY2aeeKSofNy04aAen6sgsXB7RK/tZTC+NUuc7u6H4TxaVIPqDqgEcSXqOuRRiG4FlY1I+rKgrewnIyt2YH5dkAPIWhl78y50aIK4E6Qrcf5P9qNuT+oCVxlPpQxToG9L8QWk45iNxt8+YSx6AUl29hTyX3K8u2Enr1nfccJsaGrD3kRsQO5zB+WlGl4OhxTLhJ8++X33tOZ8lQsOpTwF/zqa3xj1RiEilC7L3mHRBDU/4KM31XCmdWTGDh3DrGA6BTNRNkEVNbktfJmdGB0sOBOqnYEZhHDEQehswLjUD3CRP8EY3QNt6e2csYFjJugzF+djL7R8sM/g19joE/HMz0XUujYIzdis6B1cA4ZxZHiZ1HDlOXcsNwxSEmItBfAnpGZ4AnoSDJb1O0yYxBWmFltr8ne9cya1hiIkitZOfMkcCwvHuB7K9zZn4IbGWmR1AthhUYVPe5N3Q/5+J9AuyROHjs78hY9wyoohtiTmxNBSqbw4I/Tm2c/PqKvOGSIf374izdd1B2iXCCil/I8Fm8pi+wjhXdTVlnWFXAEoFZ+XVmlSk5wc52ZGJ9wI8LVGNGipT/sQSu94xpIrhUzP1hkDQu4T0pPhTYVdJnOlx+681d7MMrRCqaJyh587UhGWlE5Upi5VIfwrnXzDniSnwID2ngOkXjQrhNBeIE3P48VQvl1j/PQ+CsjhZj20H/Ei2+TUUvNy8YjaymO7/rIKmVdQUAhbpHWyjTRJnpZ4zlvXxaUMkH+Lwci43UyMZmWOcUlHQBSbc0tKzy290L6Sn4BmKt9ARYZxqXlMiA7YGjmfponl8YOM0w1BDnKHiy6XmPNV3ARNkc9b+kj3Z8scPCgCLm1Z7nwp1+jeEQeqb0lY6lgLQy0dMOGnsSPzegA/NX7YgoqbIi2vUOKuB4Hef6WJb9XvwvU7XQiPI9x2x8wa4vCSg== X-Microsoft-Antispam-Message-Info: terhj50CKD2wPGYx47Qr+jK271S9mwGPCGc3lQLZpFcHwWIY16NYYlkLTVvjmWQ0jAgx1eQzUR96ydfBgXHSWa9uSo0t8edwGRlpUkQoiUMmnjYBIayZNNAZ2bnDlnMzBufHy55c+WBTX78ph5Q/wOcV6gcwwg6zJnUWgnHGVKXcmnh5U6DeL/YFvbuYXBs7+FxfC3Fa7sjtYwFwgXJMsZqJPuHxCnpZsK/M1V3VkPMz76Mw5hwlGgiGpfjKQ97bhH5/ckNm1HTTiINk6aokkfoICa/YmR/xVKErtGs4G73WAcf0VPDMSzT68cgI+eg8NHmUrFJM8iud9PXMRjxHzY1HNIaC+VaPA6OEWkZ4R08= X-Microsoft-Exchange-Diagnostics: 1; SN2PR19MB0735; 6:mZFanitg5489gM1jbY9xthfbEUmeyhv3EjBwuWwJlgx4OgHatndO7vb08bWUTI9Fu3zF9xxbv/CLh1Nh7EGjSkvxnNouI695hhZTWgkp2ubBeypkt4CLQszuMEFlpkm2uv/aIerCTEktD8log4YmcJWF4K3Iy2A1q5ckb/ASXujTr9OQxEcb/AtDBWDFhM5JP76bPP5A/fDFH4H6kz5X8lIM80WUIToKOJmINs/9XxIXKeaUy+fJf+Y1LZPNKE2on574dLwjt1FWPcdCIPI/5zWJea1yz17uWTgxQcC2jDWeSDPbAoklPMzqv29+GPTD5nOkgb1PkOFdbG4CbZC/Rk+6xV3aEJcd+7cT42mcXEj8YM2T6PHgShaArHIshLYsVWqWoxSyR6hm8mFNOWYuZg/L3YYp2mfKS/aVJtlh483qD2fY5lHwakgBQLNOcFiI+L+M6F0ZfGg6v7kXcL20Aw==; 5:fxPvmoXtcNeKUq+WPP+7d/Ws7+/AXAct4128hQprJJCxE6emVpQ5+psRx/RS2U9nB3jjtTH3NXWb7mBHgoIuuZEDEAIYqJ9Sr0i819XWK2Ah2HB9umGJyMgMqZ9vB0EMsuVqohmj8vWNO1oOWRI8WBnIUGsBpXj2d3UUZQ8Nshc=; 7:UXlcUj+/2KJ8dcJcJjf1Uu4aCawodJ22QvQjNoxLPAzTf+2v/9yDWGR8BfVF196iHfrmaFIOS/qlGG2alT951PojuiFUXXnNJrgRko/MVelcsbIgmwGfOdYyvzcyhK5JyX+FGI6a78UP/Fqb7r9few== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2018 03:16:29.1939 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9e74a889-0b8d-48bb-b1c6-08d64aa8bc48 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[208.19.100.22]; Helo=[AVMBX2.microsemi.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR19MB0735 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Kelvin Cao MRPC Input buffer is mostly memory without any side effects, thus we can improve the access time by enabling write combining on only this region of the BAR. In a few places, we still need to flush the WC buffer. To do this, we simply read from the Outbound Doorbell register seeing reads to this register are processed by low latency hardware. Signed-off-by: Kelvin Cao Signed-off-by: Wesley Sheng --- drivers/pci/switch/switchtec.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index a908670..0b8862b 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -113,6 +113,19 @@ static void stuser_set_state(struct switchtec_user *stuser, static void mrpc_complete_cmd(struct switchtec_dev *stdev); +static void flush_wc_buf(struct switchtec_dev *stdev) +{ + struct ntb_dbmsg_regs __iomem *mmio_dbmsg; + + /* + * odb (outbound doorbell) register is processed by low latency + * hardware and w/o side effect + */ + mmio_dbmsg = (void __iomem *)stdev->mmio_ntb + + SWITCHTEC_NTB_REG_DBMSG_OFFSET; + ioread32(&mmio_dbmsg->odb); +} + static void mrpc_cmd_submit(struct switchtec_dev *stdev) { /* requires the mrpc_mutex to already be held when called */ @@ -132,6 +145,7 @@ static void mrpc_cmd_submit(struct switchtec_dev *stdev) stdev->mrpc_busy = 1; memcpy_toio(&stdev->mmio_mrpc->input_data, stuser->data, stuser->data_len); + flush_wc_buf(stdev); iowrite32(stuser->cmd, &stdev->mmio_mrpc->cmd); schedule_delayed_work(&stdev->mrpc_timeout, @@ -1231,23 +1245,38 @@ static int switchtec_init_pci(struct switchtec_dev *stdev, struct pci_dev *pdev) { int rc; + void __iomem *map; + unsigned long res_start, res_len; rc = pcim_enable_device(pdev); if (rc) return rc; - rc = pcim_iomap_regions(pdev, 0x1, KBUILD_MODNAME); - if (rc) - return rc; - rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); if (rc) return rc; pci_set_master(pdev); - stdev->mmio = pcim_iomap_table(pdev)[0]; - stdev->mmio_mrpc = stdev->mmio + SWITCHTEC_GAS_MRPC_OFFSET; + res_start = pci_resource_start(pdev, 0); + res_len = pci_resource_len(pdev, 0); + + if (!devm_request_mem_region(&pdev->dev, res_start, + res_len, KBUILD_MODNAME)) + return -EBUSY; + + stdev->mmio_mrpc = devm_ioremap_wc(&pdev->dev, res_start, + SWITCHTEC_GAS_TOP_CFG_OFFSET); + if (!stdev->mmio_mrpc) + return -ENOMEM; + + map = devm_ioremap(&pdev->dev, + res_start + SWITCHTEC_GAS_TOP_CFG_OFFSET, + res_len - SWITCHTEC_GAS_TOP_CFG_OFFSET); + if (!map) + return -ENOMEM; + + stdev->mmio = map - SWITCHTEC_GAS_TOP_CFG_OFFSET; stdev->mmio_sw_event = stdev->mmio + SWITCHTEC_GAS_SW_EVENT_OFFSET; stdev->mmio_sys_info = stdev->mmio + SWITCHTEC_GAS_SYS_INFO_OFFSET; stdev->mmio_flash_info = stdev->mmio + SWITCHTEC_GAS_FLASH_INFO_OFFSET; From patchwork Thu Nov 15 09:44:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Sheng X-Patchwork-Id: 998062 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=microchip.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42wRNR6J5Jz9s5c for ; Thu, 15 Nov 2018 14:16:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728748AbeKONWj (ORCPT ); Thu, 15 Nov 2018 08:22:39 -0500 Received: from mail-eopbgr800085.outbound.protection.outlook.com ([40.107.80.85]:55616 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728499AbeKONWi (ORCPT ); Thu, 15 Nov 2018 08:22:38 -0500 Received: from DM5PR19CA0010.namprd19.prod.outlook.com (2603:10b6:3:151::20) by BY2PR19MB0391.namprd19.prod.outlook.com (2a01:111:e400:5a2d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.31; Thu, 15 Nov 2018 03:16:30 +0000 Received: from BL2FFO11FD006.protection.gbl (2a01:111:f400:7c09::168) by DM5PR19CA0010.outlook.office365.com (2603:10b6:3:151::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.21 via Frontend Transport; Thu, 15 Nov 2018 03:16:30 +0000 Authentication-Results: spf=softfail (sender IP is 208.19.100.22) smtp.mailfrom=microchip.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microchip.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning microchip.com discourages use of 208.19.100.22 as permitted sender) Received: from AVMBX2.microsemi.net (208.19.100.22) by BL2FFO11FD006.mail.protection.outlook.com (10.173.161.2) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.1339.12 via Frontend Transport; Thu, 15 Nov 2018 03:16:30 +0000 Received: from AVMBX3.microsemi.net (10.100.34.33) by AVMBX2.microsemi.net (10.100.34.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1531.3; Wed, 14 Nov 2018 18:46:17 -0800 Received: from server1.microsemi.net (10.188.116.185) by avmbx3.microsemi.net (10.100.34.33) with Microsoft SMTP Server id 15.1.1531.3 via Frontend Transport; Wed, 14 Nov 2018 18:46:15 -0800 From: Wesley Sheng To: , , , , CC: , Subject: [PATCH 5/5] switchtec: MRPC DMA mode implementation Date: Thu, 15 Nov 2018 17:44:04 +0800 Message-ID: <1542275044-10970-6-git-send-email-wesley.sheng@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542275044-10970-1-git-send-email-wesley.sheng@microchip.com> References: <1542275044-10970-1-git-send-email-wesley.sheng@microchip.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131867253902877199; (5a93feec-e11d-4f7b-166a-08d09f1f276b); () X-Forefront-Antispam-Report: CIP:208.19.100.22; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(136003)(346002)(2980300002)(189003)(199004)(36756003)(68736007)(76176011)(450100002)(81166006)(14444005)(81156014)(8936002)(217873002)(47776003)(8676002)(69596002)(106466001)(48376002)(105596002)(53416004)(26005)(51416003)(5660300001)(77096007)(4326008)(356004)(6666004)(2616005)(126002)(476003)(11346002)(446003)(54906003)(16586007)(110136005)(316002)(498600001)(2906002)(2201001)(336012)(486006)(50466002)(97736004)(50226002)(44832011)(86362001)(107886003)(305945005)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR19MB0391; H:AVMBX2.microsemi.net; FPR:; SPF:SoftFail; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD006; 1:INHsdHkEPHU+3SOyYVOzBJ0SAjhw2Jt6IWhrpb/ssnqMNGfczdTaoDUYFH+tFnD2IQFhJ2W79cKaiXmf6hs8DavIY15p49EuqKn7hGynl1yoVx+//lgIsB2D7k327X6B X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b6681c7-bd0b-4643-220f-08d64aa8bcda X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(5600074)(711020)(2017052603328); SRVR:BY2PR19MB0391; X-Microsoft-Exchange-Diagnostics: 1; BY2PR19MB0391; 3:IeGrHZA7fgiQ/dvXAVIq3QU7gwduPzWgme2HSIbaXniYbuXNgR0fulBIsmIEeaGaZnnK5jUQsa0Mgz+XTQRY0SZ3uyhnnoqLDOqrmUgldJVWazm7vkAz5kvFwtRKbyk7eA6nNlWW0vdluninR8GWRS6mch3ZNT5E4H8Zq0CVfs+ivzEOy18dkKXy0Ar6FTTGy+LQ8gk8I/QV1MXNB7B/XxZZyJO8XWgWW1w+3UlLy3txZvjRCKrkeGGWomUyPsiSQTvRpeO8LTzBUu+8osj24eRJp7hhSy+HdEn685T3Cs8JbqFf60jjjlPxQeFKvBD4+IxQVXdBFAx8AgTGzoiMaVqpXClc2WxG7sAKAtChnVc=; 25:h9KvteIEhqqknCfQ+OsjAAm3bRzMAYRsmTfiMDGF1Rm3G1t9F9mtPST2MnM6aqbMJzRuzm6WPNfmWh0XfgCzgOzK516B8D0SUwbxuL2OfpQo+NrWLYdN01z2Jsx+gcUCjqytqYqZ85bllr551LM2NtkC6mRSpdNjPRtSu9XHOkirBKE+GBOhoBW2Fdm5J7Nh48575p3z5LczPd1X3SNr4SvMKVzmNdgE8iUCnu9jm9glB6GfHESAMDxLcm9p00fdli4PwD0mo3VbL+4I0H2KMN6iwB0b3ejLH6+GqdXadSUNq/tidvPdEvija7PTS2HAp7pzjPcjwT7p2KnJfEnZkg== X-MS-TrafficTypeDiagnostic: BY2PR19MB0391: X-Microsoft-Exchange-Diagnostics: 1; BY2PR19MB0391; 31:/m6QVQ8q5cHxkuRh7hiETlamFV27GYEpOFx4/gxg/ZdczXRbdrSg0hJv+eAHiyH6hLt378ri3BXxItg3RHkDcuVj2+S8bT2+64IFnkwofHRvVqMlr1qEZxJQ4CD1o4v66w94MAkIkzHTnYs/Z3H4gqeLVA/Ai4+o+afVM4Yzl8UCJJlcSlKv97S1makpKk1jMIhh+giJHGrEBTJA8m+sIUOekJJ1eznLqqG/RSM+k7Q=; 4:OBsr6B5oQQOY727Gdovls48m3D8R+mntS5dcuBJbdE4RGHDen2KZv+ypw0kpjpMP1I0Bdaub7XyLPUs6Tfq95qu62ZupyWk1oZ8a6ydgLpk7h4eg0wb3jAiUYiFAPquTIjBu8twApDvKaYIe5BiUd+bKJ6e1qf10l3ZCEOUX6w0isvBVczy/gKNPhofd/A2/ovO4Jq7aM3K9k8UrTWrriB6YFGGtR7EOgq1nkdIQfCR0LPd6HvuSbl3vSJwcdOMZXIqlaMrcHKRAkXofP3OItA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231415)(944501410)(52105112)(10201501046)(3002001)(6055026)(148016)(6096035)(20161123556025)(20161123561025)(20161123565025)(201703131430075)(201703131433075)(201703131448075)(201703151042153)(20161123563025)(20161123559100)(201708071742011)(7699051)(76991095); SRVR:BY2PR19MB0391; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR19MB0391; X-Forefront-PRVS: 08572BD77F X-Microsoft-Exchange-Diagnostics: 1; BY2PR19MB0391; 23:0UlHX2e2rah0nvdtvT5PB3vaN883a2B6Jeb35uYQrpN+SsB9CbEz2ND1xT1E/Xg0MlsphzcdKz7EHENFqLEGRreiedMELOs/k/1WLZgDxG4vxJYN9a9rs+XfNx0OuyKqpb6irSmM0MeEMLAM248qtwgk/lG+i/sWlQFdoK6s6nbJj6Q5jZPttmfFgqxqx2aQCWU9OYl2irolcFtId2yBr2IoCdeq36AIL3ru3WXsFAhBY52hhQjXanRITlhl+l1NGMupM8g8XKM+ugxMlwbXkuLhlvydK8zCwb5fQwwLTtZYUUMpwKa3ZcibkogEx8jQrEec7w9ADStdTMrm1JeQ0hymHN5tIGW31RPCNZ1+2b0qS7l/I9nHKYTjm7/06YbB6Nm/dSaKF9p4d2KQS3uuFYBr8jVEqrvdnoR1t0zvDoCWm2VxdFDK3Xf2kNaZ7oI+cKn//FTfU9FXjOwvbrV8n/QLOk4O+DrzPvLsYb1xTDf70IxKAbvPy8QiKoe2/75TNmXjLBiIKpHG1CwcAC+33MaoE2ht3BZHp0lE6zUNA1Ie9oV9zjwMDcnNrXa6sNShDmL/tEgOrn5k3C+W0ov77gTP8ghTCorKW3fBEU5yyDy6TOhPn2LqNiVh4HKniQFp9i/XiwdC4TNs++REjZ0HRBdFfLN7bJjRzogXQhdyP3GL+FPxe/XnOpV/QIiVcx7Fs+7EB9fmcNRs6sPTXpV2rajtpEjjnVZIL1da58qY3yBEY/KkMpldO1yCMtDYlots9oRIf5PZIpwi1hHIIM6Vbip4fPv7V+0cgioeVaKTEjjpd9AEsOQymkO8T18XkJpQuxFvyjyKtzfvDQl7JputW5RGv+eKJK6NDaQveNs7JcWgoIMnfD7v1IvlhVQwHjOo8y8KBb2w+vmX/7QxxdQZqdr4tWrNFewnm30Zae/J2P/hjesVLr1YAzPCwxlwrKmSdaUohl8h9kPw91/pjzFI9qOje5owpSSA9+kkNzeXWENKyZlZup9hXjjeZKO9NRBaSvGU/VtPOgvFLHs5ok5t7lyp1kxL3G0jXWj9e8jLCTyExJwGsyw3DOyv513wMbbl9YVpKEDMcIv8VFeOmqHntb7iCu3bhIJn4sH0mGEzhYHbE5HbMQFCcjb13mh3yJusieapk/CNypHagV6KEcbzVfNaZyrSLpFNrkP3w6hVaH0= X-Microsoft-Antispam-Message-Info: L1z/AvtNkp+Nqs9EZF0t692yv1ffSt5AZZ6PoImNwtnl3TSTuwXaUhl7zoq5qh2K2PkGliTtnX5XuokhSB1F/6dFRpkK97NSaoqByGlIv+7ALtXmUIEV9LFTOj8/Y7R8j6zIm7/HV/3rFbIf4jffFeWvE9xlfe2q+bT6/QtxLqgJCLbWGLpW430tDAx685WD7qZkmC59VG3VyLkZAbeeao/pwFIQEBKNCvUHHTlWKUJlWT0evx7cuXYT+IYnbumhWoNhyI/rMS6d/ZP4Iyb3tceUJnGGypwp6Rk/OiMJtOjWmx/5SKrhJAUgFVB8vps+G6GSIKXhxniqpwwWPHe52E+aVPNEmRCQcaEG/4tsqwY= X-Microsoft-Exchange-Diagnostics: 1; BY2PR19MB0391; 6:LRoQIWF98MImIvDRs+BBVSfaVhtPo7ZXaZvzcShrX0vHASrI3J2WY5lTlNp/4rGyYpAc6aquKtUon/RhvSkpu3Td7cjunTimPrQZAVZZ8qHyh4Ds3/QWoCuEyQ25Pd4d9nVS41+GySKZQwIYMLOK0JYR120FrxacH6W93E4iHBCcGMV8IpRrAQouTav4iYzk91j0qvJ0RYnIEvhf1WDNhKAr37Kbjf1pbcKtRJbDEFpMkNXSYJJV4Zzf4RT5E7RmF0Eea+kglCWrVHcS3S+gF9dtCG/rudlS+1140cF+D2rJwiBMWCSLwUFcgGGZyGvWqwVZdawXreC7sDQmrzvB4BkuN8mltGjzKT1n6FsFLn4dkuoOR3vrUmWinKBOw5AuKFfPndpRQk+EkGH/KhZmn43wk4qqDFiTpfGlGkVyuKgQvVGsLwLofUBzIp9sHRueWQ0Rf/KXbRc/gjoDO25bTA==; 5:E6fM7YhFakEHIfNxXF9GdZUGpBiePrMrYB2Lq5vtB/DW1QzPbfOp/7FZAApFKQtY7f394M9cc10tTt1I0H/aHayc3GZ4UWpeQ1oLlK8FEh/y6HG6MYuG77B/3qrjXCzwEaUIQaEKVfYNOq/HaQAJ1uazCoV1DK8FW711GFFvJKg=; 7:y1pjUV5i4EqOfr9dhz7xxsfh2NUILqBikRrqw4HnXt/tQXSEc67T4ltzZcXCcNHTqwxkFuODIuiIX5IaFWlqGZlRsxZfIAKMoyZlYi4dWBIVqiJcBySah/MEMmyfrKCHTXHIXqRGGEvbzVn0cLVjsg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2018 03:16:30.1470 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b6681c7-bd0b-4643-220f-08d64aa8bcda X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[208.19.100.22]; Helo=[AVMBX2.microsemi.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR19MB0391 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org MRPC normal mode requires the host to read the MRPC command status and output data from BAR. This results in high latency responses from the Memory Read TLP and potential Completion Timeout (CTO). MRPC DMA mode implementation includes: Macro definitions for registers and data structures corresponding to MRPC DMA mode. Add module parameter use_dma_mrpc to select between MRPC DMA mode and MRPC normal mode. Add MRPC mode functionality to: * Retrieve MRPC DMA mode version * Allocate DMA buffer, ISR registration, and enable DMA function during initialization * Check MRPC execution status and collect execution results from DMA buffer * Release DMA buffer and disable DMA function when unloading module MRPC DMA mode is a new feature of firmware and the driver will fall back to MRPC normal mode if there is no support in the legacy firmware. Include so that readq/writeq is replaced by two readl/writel on systems that do not support it. Signed-off-by: Wesley Sheng --- drivers/pci/switch/switchtec.c | 108 +++++++++++++++++++++++++++++++++++++---- include/linux/switchtec.h | 16 ++++++ 2 files changed, 114 insertions(+), 10 deletions(-) diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index 0b8862b..6b726cb 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -13,7 +13,7 @@ #include #include #include - +#include #include MODULE_DESCRIPTION("Microsemi Switchtec(tm) PCIe Management Driver"); @@ -25,6 +25,11 @@ static int max_devices = 16; module_param(max_devices, int, 0644); MODULE_PARM_DESC(max_devices, "max number of switchtec device instances"); +static bool use_dma_mrpc = 1; +module_param(use_dma_mrpc, bool, 0644); +MODULE_PARM_DESC(use_dma_mrpc, + "Enable the use of the DMA MRPC feature"); + static dev_t switchtec_devt; static DEFINE_IDA(switchtec_minor_ida); @@ -141,6 +146,11 @@ static void mrpc_cmd_submit(struct switchtec_dev *stdev) stuser = list_entry(stdev->mrpc_queue.next, struct switchtec_user, list); + if (stdev->dma_mrpc) { + stdev->dma_mrpc->status = SWITCHTEC_MRPC_STATUS_INPROGRESS; + memset(stdev->dma_mrpc->data, 0xFF, SWITCHTEC_MRPC_PAYLOAD_SIZE); + } + stuser_set_state(stuser, MRPC_RUNNING); stdev->mrpc_busy = 1; memcpy_toio(&stdev->mmio_mrpc->input_data, @@ -180,7 +190,11 @@ static void mrpc_complete_cmd(struct switchtec_dev *stdev) stuser = list_entry(stdev->mrpc_queue.next, struct switchtec_user, list); - stuser->status = ioread32(&stdev->mmio_mrpc->status); + if (stdev->dma_mrpc) + stuser->status = stdev->dma_mrpc->status; + else + stuser->status = ioread32(&stdev->mmio_mrpc->status); + if (stuser->status == SWITCHTEC_MRPC_STATUS_INPROGRESS) return; @@ -190,13 +204,19 @@ static void mrpc_complete_cmd(struct switchtec_dev *stdev) if (stuser->status != SWITCHTEC_MRPC_STATUS_DONE) goto out; - stuser->return_code = ioread32(&stdev->mmio_mrpc->ret_value); + if (stdev->dma_mrpc) + stuser->return_code = stdev->dma_mrpc->rtn_code; + else + stuser->return_code = ioread32(&stdev->mmio_mrpc->ret_value); if (stuser->return_code != 0) goto out; - memcpy_fromio(stuser->data, &stdev->mmio_mrpc->output_data, - stuser->read_len); - + if (stdev->dma_mrpc) + memcpy(stuser->data, &stdev->dma_mrpc->data, + stuser->read_len); + else + memcpy_fromio(stuser->data, &stdev->mmio_mrpc->output_data, + stuser->read_len); out: complete_all(&stuser->comp); list_del_init(&stuser->list); @@ -231,7 +251,10 @@ static void mrpc_timeout_work(struct work_struct *work) mutex_lock(&stdev->mrpc_mutex); - status = ioread32(&stdev->mmio_mrpc->status); + if (stdev->dma_mrpc) + status = stdev->dma_mrpc->status; + else + status = ioread32(&stdev->mmio_mrpc->status); if (status == SWITCHTEC_MRPC_STATUS_INPROGRESS) { schedule_delayed_work(&stdev->mrpc_timeout, msecs_to_jiffies(500)); @@ -239,7 +262,6 @@ static void mrpc_timeout_work(struct work_struct *work) } mrpc_complete_cmd(stdev); - out: mutex_unlock(&stdev->mrpc_mutex); } @@ -1030,10 +1052,24 @@ static void enable_link_state_events(struct switchtec_dev *stdev) } } +static void enable_dma_mrpc(struct switchtec_dev *stdev) +{ + writeq(stdev->dma_mrpc_dma_addr, &stdev->mmio_mrpc->dma_addr); + flush_wc_buf(stdev); + iowrite32(SWITCHTEC_DMA_MRPC_EN, &stdev->mmio_mrpc->dma_en); +} + static void stdev_release(struct device *dev) { struct switchtec_dev *stdev = to_stdev(dev); + if (stdev->dma_mrpc) { + iowrite32(0, &stdev->mmio_mrpc->dma_en); + flush_wc_buf(stdev); + writeq(0, &stdev->mmio_mrpc->dma_addr); + dma_free_coherent(&stdev->pdev->dev, sizeof(*stdev->dma_mrpc), + stdev->dma_mrpc, stdev->dma_mrpc_dma_addr); + } kfree(stdev); } @@ -1189,10 +1225,27 @@ static irqreturn_t switchtec_event_isr(int irq, void *dev) return ret; } + +static irqreturn_t switchtec_dma_mrpc_isr(int irq, void *dev) +{ + struct switchtec_dev *stdev = dev; + irqreturn_t ret = IRQ_NONE; + + iowrite32(SWITCHTEC_EVENT_CLEAR | + SWITCHTEC_EVENT_EN_IRQ, + &stdev->mmio_part_cfg->mrpc_comp_hdr); + schedule_work(&stdev->mrpc_work); + + ret = IRQ_HANDLED; + return ret; +} + static int switchtec_init_isr(struct switchtec_dev *stdev) { int nvecs; int event_irq; + int dma_mrpc_irq; + int rc; nvecs = pci_alloc_irq_vectors(stdev->pdev, 1, 4, PCI_IRQ_MSIX | PCI_IRQ_MSI); @@ -1207,9 +1260,29 @@ static int switchtec_init_isr(struct switchtec_dev *stdev) if (event_irq < 0) return event_irq; - return devm_request_irq(&stdev->pdev->dev, event_irq, + rc = devm_request_irq(&stdev->pdev->dev, event_irq, switchtec_event_isr, 0, KBUILD_MODNAME, stdev); + + if (rc) + return rc; + + if (!stdev->dma_mrpc) + return rc; + + dma_mrpc_irq = ioread32(&stdev->mmio_mrpc->dma_vector); + if (dma_mrpc_irq < 0 || dma_mrpc_irq >= nvecs) + return -EFAULT; + + dma_mrpc_irq = pci_irq_vector(stdev->pdev, dma_mrpc_irq); + if (dma_mrpc_irq < 0) + return dma_mrpc_irq; + + rc = devm_request_irq(&stdev->pdev->dev, dma_mrpc_irq, + switchtec_dma_mrpc_isr, 0, + KBUILD_MODNAME, stdev); + + return rc; } static void init_pff(struct switchtec_dev *stdev) @@ -1294,6 +1367,19 @@ static int switchtec_init_pci(struct switchtec_dev *stdev, pci_set_drvdata(pdev, stdev); + if (!use_dma_mrpc) + return 0; + + if (!(ioread32(&stdev->mmio_mrpc->dma_ver) ? true : false)) + return 0; + + stdev->dma_mrpc = dma_zalloc_coherent(&stdev->pdev->dev, + sizeof(*stdev->dma_mrpc), + &stdev->dma_mrpc_dma_addr, + GFP_KERNEL); + if (stdev->dma_mrpc == NULL) + return -ENOMEM; + return 0; } @@ -1325,6 +1411,9 @@ static int switchtec_pci_probe(struct pci_dev *pdev, &stdev->mmio_part_cfg->mrpc_comp_hdr); enable_link_state_events(stdev); + if (stdev->dma_mrpc) + enable_dma_mrpc(stdev); + rc = cdev_device_add(&stdev->cdev, &stdev->dev); if (rc) goto err_devadd; @@ -1350,7 +1439,6 @@ static void switchtec_pci_remove(struct pci_dev *pdev) cdev_device_del(&stdev->cdev, &stdev->dev); ida_simple_remove(&switchtec_minor_ida, MINOR(stdev->dev.devt)); dev_info(&stdev->dev, "unregistered.\n"); - stdev_kill(stdev); put_device(&stdev->dev); } diff --git a/include/linux/switchtec.h b/include/linux/switchtec.h index ab400af..eee0412 100644 --- a/include/linux/switchtec.h +++ b/include/linux/switchtec.h @@ -29,6 +29,7 @@ #define SWITCHTEC_EVENT_EN_IRQ BIT(3) #define SWITCHTEC_EVENT_FATAL BIT(4) +#define SWITCHTEC_DMA_MRPC_EN BIT(0) enum { SWITCHTEC_GAS_MRPC_OFFSET = 0x0000, SWITCHTEC_GAS_TOP_CFG_OFFSET = 0x1000, @@ -46,6 +47,10 @@ struct mrpc_regs { u32 cmd; u32 status; u32 ret_value; + u32 dma_en; + u64 dma_addr; + u32 dma_vector; + u32 dma_ver; } __packed; enum mrpc_status { @@ -342,6 +347,14 @@ struct pff_csr_regs { struct switchtec_ntb; +struct dma_mrpc_output { + u32 status; + u32 cmd_id; + u32 rtn_code; + u32 output_size; + u8 data[SWITCHTEC_MRPC_PAYLOAD_SIZE]; +}; + struct switchtec_dev { struct pci_dev *pdev; struct device dev; @@ -381,6 +394,9 @@ struct switchtec_dev { u8 link_event_count[SWITCHTEC_MAX_PFF_CSR]; struct switchtec_ntb *sndev; + + struct dma_mrpc_output *dma_mrpc; + dma_addr_t dma_mrpc_dma_addr; }; static inline struct switchtec_dev *to_stdev(struct device *dev)