From patchwork Mon Jan 29 19:47:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 867271 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zVg911Zx3z9s71 for ; Tue, 30 Jan 2018 06:50:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Gmn9rytZ"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zVg906vs8zDrJS for ; Tue, 30 Jan 2018 06:50:28 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Gmn9rytZ"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=permerror (mailfrom) smtp.mailfrom=nxp.com (client-ip=2a01:111:f400:fe09::628; helo=eur03-ve1-obe.outbound.protection.outlook.com; envelope-from=roy.pledge@nxp.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Gmn9rytZ"; dkim-atps=neutral Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on0628.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::628]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zVg6k74mCzDr6N for ; Tue, 30 Jan 2018 06:48:28 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=KBHdKMSnZGXQLyvCebi69ilqC/2FcMzFmM/BERnv1EQ=; b=Gmn9rytZR3JnqRDPf9OxgubfXqhZp/pmEFd1p3sPXMwzYkNqh3sKoauM8/UM6SoLRVxE7hqYFMKUgIzI/KORS0oAUgKkKl85h+xwCmQQ/JP0NZgdRU/pu6cxH1MmFjWvX08lAoU72azb1f+5EdWMVx2RQk8bAOp3bzft9FaJwVk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=roy.pledge@nxp.com; Received: from otc-sw1.am.freescale.net (192.88.168.1) by VI1PR04MB3007.eurprd04.prod.outlook.com (2603:10a6:802:9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Mon, 29 Jan 2018 19:48:19 +0000 From: Roy Pledge To: linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, leoyang.li@nxp.com Subject: [PATCH] soc/fsl/qbman: Check if CPU is offline when initializing portals Date: Mon, 29 Jan 2018 14:47:53 -0500 Message-Id: <1517255273-10178-1-git-send-email-roy.pledge@nxp.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [192.88.168.1] X-ClientProxiedBy: BN6PR22CA0036.namprd22.prod.outlook.com (2603:10b6:404:37::22) To VI1PR04MB3007.eurprd04.prod.outlook.com (2603:10a6:802:9::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 68cf42f6-fbc3-4dc5-f687-08d56751409b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR04MB3007; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3007; 3:Z8MDfdhjQZOAR164lQyprZHFSBK8gIzeULdSOHpzNokY270df3Zd+qkcE8kR0lmJwUsR+l1kBYpgvoL3kU14d3BPG1kC+CY1GVV4yN+ODRCL8x7Vql/3cr+Ix9hXK0Yi+RsLZrwbeAyEjIuNGzxwjqKd/WerQY7DAp2uCikYmXLQmy1rb2cKALEN+co8QymEglK8VByleTM4UnsocLa/dV2/aMl8L+um8SCOKuR1erPCzFzbd7i6lwxnBxpLs+b5; 25:DBVsOe68Wpqwj9yoUANRMHaVPMx8svbP2mNK7qzSinSVMAUU225u3Xf+m5edyVVs71xHniVgUpQn0X11YrekaE+2d1dBul9XBHvrj4UJ1OubP7YAPdaoTsO+JPLHwl48Fp7D7vvJoq1M8zONAN3iE2LFp+wlcdVi25FYBVgJxIxQYTaXZ7L5igeRUp42Sg8XoeKHl1HynDpVMsVfGds/jsLu2oAdLt8TS1PmZCWDGNPPZsJu+QJWCNEMCsMva9M0QNFJLhb+WNlXBCQK/gZLYpI/HqXwzOQwBQj9mMNsHv6p9oToR5jwmn8yTKIDVS5Uxci6jllfs+5LotPSw4eTtQ==; 31:TacXLXG/bp9jfoqbpNCofatS2cbRzIO8keSicDTR3txBizOUESs5Fc4GC1DWSENva8vWKRC0+onH2He4IvbUe6//Xc5Wms8xmKqHvMlBwuqkGLSEFDOh+nZOroyY2sbmuCIEvGOHWcoWfGi+/aWOVdFkYEeEX+Si7l+TCW9eGQ5hill8Ku53zQF+LxloEXa05tKlsvT6XSyjsRGa5KSd0WMndR4BuJK2dlWD8aZ2M2U= X-MS-TrafficTypeDiagnostic: VI1PR04MB3007: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3007; 20:YrNLAbMDniAkqgkKjZSNb3VAnufV1/sWMJ1iGp4+7p4zgPsIWIbtuJJYAOMiftFtQToMS790YG8yJLHDwd4sOazWMhErWShescgkhhwkLKPdQR7+gmyRvD1774vdbf18mJPhVLQHyWO+wkqkWH6kiXrS5+ha8T4CW7hUCUGMLnffA6GTnCTpVw70tP+9Plb3Qy/Un80B0Q1nV8g1+tXmAJrkGtE3/8MNwtCnPb+NfZZK3WH9+eLsLUgKP2CQdEMKTtQt3nHKk0JjeHbdwngprX1crlGSG09WkXv2c8erh+sQlzxw8XXYEjJIWD+TN+d72OygJYpGYepWPGVsm2OIDZsktdO/YhnTBTd0dYXFhqwwEaGg6FDNWqrYJAdqXB96aYbK8ttXcj6s3v/PmSeQXv0Gok4zdGna4rGfP25w8VcluCukULrfmmmkglXXR1xqdklvbJO2yvJLhAxz3u7msMRbxQCDYIDHpgHxMgshFArWr0sW8ygVraBG4L/kLyr9; 4:THwBYKWiC1j5Xp8qx3ICSVTjMbBtekG7jb/KwBLyslpRyQ+TfPFwjTBVYdqrWP/8A+sjNdROs3I9SQhTTbrzBastkZ8nIRJNKp/xPcP9Z+cfUKrdEEPOUwzUtX/aq7RshA0+7y3NlNBX95IA/0gvRtj7s5rvWxx5SaIhXcIIiTlf9sibE4esWvZdTAJcBWXwxO1bG6BWtWX/YHnNBbcDRQLs6S77NGMag7nwUZNMgpnrHdmXfGytQkjEX1QXNp55ppwgs8c9Q28QHJ/eW76mI9y4CtQ/9o9fg9W7YDCl1m5kQ+gN7tPQfI9u+2tS+xwk9NdVxsxx93crIoilgApKjJjgW/60y3ey0ZjjmiSf4VxrST4y1cDY/yst3jcluvbvOXA0Tudj9TzJdTdAoMMhN4HO4n9MqJ5gmp1ooxIJHag= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(209352067349851)(185117386973197)(227817650892897)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231101)(944501161)(3002001)(10201501046)(6055026)(6041288)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:VI1PR04MB3007; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB3007; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(366004)(39860400002)(396003)(376002)(346002)(189003)(199004)(105586002)(43066004)(8676002)(16526019)(16586007)(316002)(305945005)(478600001)(81166006)(6512007)(86362001)(81156014)(6486002)(53936002)(50466002)(50226002)(8936002)(48376002)(2906002)(66066001)(3846002)(4326008)(6116002)(106356001)(26005)(52116002)(25786009)(47776003)(5660300001)(68736007)(386003)(6506007)(51416003)(59450400001)(7736002)(97736004)(186003)(6636002)(3450700001)(6666003)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3007; H:otc-sw1.am.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB3007; 23:Tz6vQ7dVTq7UeHCpmiJrgOp0WNaKZAbKPyAqgxseO?= wK/5bVflcpuF3lTdFvzBK8fc/6IeXRZ5s59h+xQ6YWCV0gO//+MDl0H8TKo39XGHxoOv5zKCysJ1OwaEQt+DxGYVroNjhG/+n8BenfzTCQim8yQ5k4HQ7bsKN/QHdD1XXyQWKzeCrRHZVNjLCCeVKIgZ+WIHvPfj4cqsseocnRIklFlb6pL/5oge+ekKX5+bAWUmT8dn6bqsz2JP/XZ2lJRobIWloXCVQtYVFLdZmCU/s9DDAB+FD/6q7x8o75kjQ2s+U3rH/vVAJ2dCDkezWC2BlTr6HyLAjVrrVTzlTvjsM4hRIowdntDS+Hp3NBqs5V2ZEI99DSlZcRBznsrGmTP7pypuh32AEJL+lEBet0K3A5u00cYQ5ob4jEEIEHD2prguXWj5gS9sN/0mGPGiVgP8H4u6j3YlcTCqG9xj6puJ3KT5fGVuzQj7Qh+a0eCh8EXijw29RF2dWmWuWlWvr+OjmJiUqOZ3wmEDAfpymmHMJ3R2TwIJHd2i4w9zQwiLELF/9kQNaI0HKF3LBFrwUZsbDoCsADSkBm0HfokjmO9gGxxkT/ttB+Yzi5QKkOoKpSmikdoAPn9MlW5a/cvLQUpHkpnA1DTPPNAESCbpJSIHWlkmqLrdnGOHx/CHyxcyJTSdvlLWlawb9hySdLpLcvfMaOhCVDQoFbH111Ud0vN39olTr2h7BMA+HyLpRDjMUOUwnjv4h+pUzR9X6dkt/sZFd73eJ76ibqbCipUoSDEa0uHhG4tYmgr22E4gjfohIEBzSJCfnUp4Yh71vQe8e7Bki+TlWtGXQgk9ovUcWzbk91BGww2OevFTwKSwvvf3Jr8jE9r8+dFOKdKm5C67VMqMJi0BDO0yRRg+eeZ3MrZtrom4LIunXeRbxEsZByMeTgGgDSVh4pj68xE/PegkrXHrYNBUgDsFS7lyKeGMc2EKUhF/XgzXh2Lprb+7fH2KPAroUtVv0yv5+kxI0zVUEtRneOWSBpfFxqmrN6i4k4uak2obQV8wQvKT9ZyNKHW1SFSZS6dm56eEVa+9Sv4HUZVw95RoukNx19ObaepzLzXWVXp/5VBdNF1TfXEBRNIAqM= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3007; 6:fq5aRJmooGGTLHKCmXqx+Pqr5hbh5RX3vD0dMjuaUzcwqtnX+1dmsUlLUGsqcS+liBh99zG/irDfyEoDCyXecWrs7bcrpkIGMJ11KU6AICJoDs8KzLwwy7FA3qvN9dqY6N3zv3kdpkCppyjDoiSKTWQSTjmLZIiTvtI2spjy5Sh2YnO8iOkjgrMm68a4hSOWB7Q9BDhx3BjXopCRhp+BLaPUQo2+Et7muNgTuKoBYAiHQbiola+YQsaKuL6E//PemBioMNDjPaPS1A8XSOFD9Hw2dje3lOKEijzp5IXSmmkgi5MwhOpLPg7ejn4XOY7MuRTYUFKAAi7SLX7o6l6mVCU2kHD/1nEexy+r948k9yM=; 5:e8AJsAbmQ3U0bjDjqagOrmfyq96pZ3HuEMUWtr8ly0LqFeJW3mZEwtkvT2i+bNV6rY2OKRywqfHh3BpTfMnx890xv+iZYS2QesoKbkjJsScouE8zyOH+AGNYpLaGrh+aXHRqe5pGyw7DmLT/Uv2tdDwdIXqF+pAadXGWzF71pJU=; 24:4yDm4ZQK88WMpfZONaEr+QEe/DKDA27gEVMNaJFF7Z3dyUiiK8bK2Lu6HYaBXIO05XeNtPT6yS7gQsrDZe9qkVYsGe40ZQ6iPVYjQlkBy5g=; 7:vnQcAljP0T4CWqBDmOFBDMQBIoMJqS9Domyyhgb5/L2P1Nunt+1sIMoF52Z/z29Pxc+0dp193Y6JbFizS+Tcsw9a3TMxf5+8lh0dYNnfJPrOpXaq7FT1KlA9Z0bFCWSUZmwGO8PNhSOcYC+VuNdWg14S8/kHF9ED5oBpjLE4IR5tt9ilysESbJ+CwDKkSTK02LANOrQFhOK/GEEvEpfx+x2PU74NYC5EvZDIHpK0eGj6YUbIhaQvjdkxlnmBPy/I SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 19:48:19.7080 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 68cf42f6-fbc3-4dc5-f687-08d56751409b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3007 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: roy.pledge@nxp.com Cc: Roy Pledge , madalin.bucur@nxp.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" If the affine portal for a specific CPU is offline at boot time affine its interrupt to CPU 0. If the CPU is later brought online the hotplug handler will correctly adjust the affinity. Signed-off-by: Roy Pledge --- drivers/soc/fsl/qbman/bman.c | 17 +++++++++++++---- drivers/soc/fsl/qbman/qman.c | 18 +++++++++++++----- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/soc/fsl/qbman/bman.c b/drivers/soc/fsl/qbman/bman.c index f9485ce..2e6e682 100644 --- a/drivers/soc/fsl/qbman/bman.c +++ b/drivers/soc/fsl/qbman/bman.c @@ -562,10 +562,19 @@ static int bman_create_portal(struct bman_portal *portal, dev_err(c->dev, "request_irq() failed\n"); goto fail_irq; } - if (c->cpu != -1 && irq_can_set_affinity(c->irq) && - irq_set_affinity(c->irq, cpumask_of(c->cpu))) { - dev_err(c->dev, "irq_set_affinity() failed\n"); - goto fail_affinity; + if (cpu_online(c->cpu) && c->cpu != -1 && + irq_can_set_affinity(c->irq)) { + if (irq_set_affinity(c->irq, cpumask_of(c->cpu))) { + dev_err(c->dev, "irq_set_affinity() failed %d\n", + c->cpu); + goto fail_affinity; + } + } else { + /* CPU is offline, direct IRQ to CPU 0 */ + if (irq_set_affinity(c->irq, cpumask_of(0))) { + dev_err(c->dev, "irq_set_affinity() cpu 0 failed\n"); + goto fail_affinity; + } } /* Need RCR to be empty before continuing */ diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index e4f5bb0..463e65d 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -935,7 +935,6 @@ static inline int qm_mc_result_timeout(struct qm_portal *portal, break; udelay(1); } while (--timeout); - return timeout; } @@ -1209,10 +1208,19 @@ static int qman_create_portal(struct qman_portal *portal, dev_err(c->dev, "request_irq() failed\n"); goto fail_irq; } - if (c->cpu != -1 && irq_can_set_affinity(c->irq) && - irq_set_affinity(c->irq, cpumask_of(c->cpu))) { - dev_err(c->dev, "irq_set_affinity() failed\n"); - goto fail_affinity; + if (cpu_online(c->cpu) && c->cpu != -1 && + irq_can_set_affinity(c->irq)) { + if (irq_set_affinity(c->irq, cpumask_of(c->cpu))) { + dev_err(c->dev, "irq_set_affinity() failed %d\n", + c->cpu); + goto fail_affinity; + } + } else { + /* CPU is offline, direct IRQ to CPU 0 */ + if (irq_set_affinity(c->irq, cpumask_of(0))) { + dev_err(c->dev, "irq_set_affinity() cpu 0 failed\n"); + goto fail_affinity; + } } /* Need EQCR to be empty before continuing */