From patchwork Tue Sep 29 10:34:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 11805549 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 63755174A for ; Tue, 29 Sep 2020 10:36:02 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 26FBB207C4 for ; Tue, 29 Sep 2020 10:36:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="i2RypJHg"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="otScLvx3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26FBB207C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=synaptics.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3hthYN+g8+Re+DkJoBNCiucOS4XqCgg2k3/mZP/ksRU=; b=i2RypJHgWbbKW5Vh8+g+tX29Y SgkXkzgV3bxqH39SITw4IBR0hlil7jw9ABz83hq1aEY2qV43A380y143B6d2MWKg9q69lE/xFo2fY BKqndbBpevDlsHdql7IGFo9RpMXGSoLuFy7SQRl0EIVCuPhKC0y5I/98uYx6oapwpg19XY6Gli4XD wY5fxG4CL0xxuy3z5ASwhZoHOqsxVDhFlRrbRh9W6CIazlU+0B3P6jEsSKR7IZKzSg0Lexd31PuMN 0lfVcnwO3TfCw816H2CuickjdaG4ggcFqDYYKUdWgKQZwImBJsX2nwbr7dBSwmg+G+colwXMq/9qM AJjctjd5w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNCz7-0000My-PH; Tue, 29 Sep 2020 10:35:49 +0000 Received: from mail-bn8nam12on2050.outbound.protection.outlook.com ([40.107.237.50] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNCz2-0000Ls-HC for linux-arm-kernel@lists.infradead.org; Tue, 29 Sep 2020 10:35:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i4Hi+0615D7mFqoXWVXWd52p7HcRnFU2AgPYn3RaHsMX0OhtnD2IFaUdgSdnF9i25zhgkcxOo9vnlmtl/oNHj1qwnKMmxcKhycMFDEGbuzfFdNKv9yc5DEDg5k6GLQYJxijbqaJXozS+MLDA5RcYlIeplItWRbSYs5giMgGLTicl90CsnhMvGBY92Xegr+uIwghcOtvpC0YJNps9IhCYon3BpSJ7eCFt4AT78DcQ+wziBJpcHCh+wbscKVkOY9dCqWDlVf8Zx80xRCU2acF0Py+l3nwq77efxPiUiDljmVevcVtakrXDPfGfTVp2I2bCCq0o+S9EjsrxvFZf4JJ8mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l4Dr/myu4aYvLHvWM34Ci8ASe+TTHr7hwue49ZswzPU=; b=cTaKz6FV0VByDcGRXjkJF4/updhwEbN8GWILftTbUQbDjxY5zUEBHVPvQ0XkVak0ggE5Rhvp0r7ilJC0dPK8xAay2KyBcKayowuRxXvtIS0T96TU8S79y8M7Lq6P/nr57dCooN4SlKTNwbeCdo/XY8I5tDbC43WQBmclcEhm8UJ4e1vN5vUlf2GmaMXL507DzOrhrKSOUtqTd/zSV4GoaeOTBdKcQKARbTbpqAw+TNHOP/a/O1X3cR+ow3GGe0ap9yYwQRjtcRs09ORAkMD5uV10foDJYaf8SYDhL4U07W/wjdeZZcIbzhYkrgPj7LWP+Ih/s09zI+1d4elaWbLFSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=synaptics.com; dmarc=pass action=none header.from=synaptics.com; dkim=pass header.d=synaptics.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector2-Synaptics-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l4Dr/myu4aYvLHvWM34Ci8ASe+TTHr7hwue49ZswzPU=; b=otScLvx3mcluuhUoSFOzs0N8HGfekuvlQZ34vKo6o8fk5xi/6PLxhb8sfJFfH3A9jdEWkUkrmHQVHkHx9YSGfznM5B5T3PSeL++kp93DgK0jjlFeTc0Id1TyV/0CxrQGXirLZidNMmqyzqwqAlRd5NrMnzhflCgVnGsL9MrQ6yE= Authentication-Results: ti.com; dkim=none (message not signed) header.d=none;ti.com; dmarc=none action=none header.from=synaptics.com; Received: from DM6PR03MB4555.namprd03.prod.outlook.com (2603:10b6:5:102::17) by DM6PR03MB5292.namprd03.prod.outlook.com (2603:10b6:5:240::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.32; Tue, 29 Sep 2020 10:35:43 +0000 Received: from DM6PR03MB4555.namprd03.prod.outlook.com ([fe80::e494:740f:155:4a38]) by DM6PR03MB4555.namprd03.prod.outlook.com ([fe80::e494:740f:155:4a38%7]) with mapi id 15.20.3433.032; Tue, 29 Sep 2020 10:35:43 +0000 Date: Tue, 29 Sep 2020 18:34:31 +0800 From: Jisheng Zhang To: Kishon Vijay Abraham I , Lorenzo Pieralisi , Rob Herring , Bjorn Helgaas , Jingoo Han , Gustavo Pimentel , Ard Biesheuvel Subject: [PATCH v4 1/2] PCI: dwc: Skip PCIE_MSI_INTR0* programming if MSI is disabled Message-ID: <20200929183431.0efda17c@xhacker.debian> In-Reply-To: <20200929183403.060d1853@xhacker.debian> References: <20200929183403.060d1853@xhacker.debian> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-pc-linux-gnu) X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TYBP286CA0025.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::13) To DM6PR03MB4555.namprd03.prod.outlook.com (2603:10b6:5:102::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from xhacker.debian (124.74.246.114) by TYBP286CA0025.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.32 via Frontend Transport; Tue, 29 Sep 2020 10:35:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 66449bdc-4263-4fd2-328d-08d864636aba X-MS-TrafficTypeDiagnostic: DM6PR03MB5292: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:431; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mp4DVuxuITue4kiJqXsU3TvzxJFcJsJaVhFmEx8iwHzqbsSwrBLErR5lGNSB2/r72lzunkG2vGqcaBU/3YolFOld5TuirKXPXmHK9AYZtPwJOCELhT1EEqkXogaR1nOn7b1lxRZ8MFYGN8pYo9RkePx8oN8TaNBwKWO15KeSM0OBP3tSDZojWhwfkadEjUMHuYj4UuzwzdTNiEw0gHHyd2d1NpnYA2+eV/rLVB6cmrbyEjXJrrfhnwh8N2I2fo8G2wnxeAvloTGYuEWHaDCBrnNXabZB+updQqtQk4IHnLeyNbJj2OgvNQfy3eBdKv4856uqLK7f2wPHVueZMZO1eA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR03MB4555.namprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(136003)(346002)(376002)(39860400002)(366004)(4326008)(6506007)(186003)(8936002)(16526019)(26005)(55016002)(9686003)(8676002)(7696005)(52116002)(86362001)(66946007)(66556008)(66476007)(478600001)(5660300002)(1076003)(4744005)(6666004)(956004)(110136005)(316002)(2906002)(83380400001)(7416002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: A7eff9x2FZvV2hNZ747ORp+g+J7bkT0tL/4fZvOj+H83ZA9gXKiBua6s478znB9i1VpNuF4hVF+28MxCAJxqA4S3QzITm0XdZLoJjTcKe8CmQmMeu82TBN7/pD+874h5nx/VIzAEtEcXD+ky3cMcvA/mNeMoGfdVwsfZh6YqtlqHW+AzycACL1ZdhFRclQ61YmBG/yQN/yZDpQbDTGbS5gdwiF149jmb082gSKEtuPYjXYoqJhLk4VgUPJZqim70aNfN2JtrtxifMcc+GSXRzFD2UEWiM1jIk9L1hC/e+r+tteES5OjdaAP5BYBsiIzd63y7v8YX9fVzcOYJ+pgBALc1H3Dmon+9PLOvN1yacfvnzZnpDIiA2SN9C5lAqbj1Cc1gNKkrG7Aji7BXUikAWTR0cIy4LhZNVYxHdBMcutxQdHReXONN0ZtYS/GTlj5RUgGt2uabqf/0TdAadhIs9Sr4Mz6Tzvtb3SdnwbANFIfqH6z2+5mO+t5Px4C9JtvZ7OwyavxRnmAURe54w29DmXLmhp8COOkPv09sETGXpuoM7AJ1azPLozd2+8ejv/dSyitduG+THv5jc8T9xEPmsXzPyA+l7UQOlenP7tEmUQlqBbF8WMaUVxeTyMWLd+hdK2yJK8+Z+UaW6HObI8iWhA== X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66449bdc-4263-4fd2-328d-08d864636aba X-MS-Exchange-CrossTenant-AuthSource: DM6PR03MB4555.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2020 10:35:43.1730 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gyXCbNL6bXQIn9cn8+HlXIqhCeMfsq1ZvqsfKlea2BYoj3DJc3H5FimIilPyYl3cF1juKmoPTX1yTrl5068Zlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB5292 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200929_063544_594338_C3F0DCC7 X-CRM114-Status: GOOD ( 12.33 ) X-Spam-Score: -0.6 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.6 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.237.50 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.237.50 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pci@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If MSI is disabled, there's no need to program PCIE_MSI_INTR0_MASK and PCIE_MSI_INTR0_ENABLE registers. Signed-off-by: Jisheng Zhang Reviewed-by: Rob Herring Acked-by: Gustavo Pimentel --- drivers/pci/controller/dwc/pcie-designware-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index 9dafecba347f..f08f4d97f321 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -632,7 +632,7 @@ void dw_pcie_setup_rc(struct pcie_port *pp) dw_pcie_setup(pci); - if (!pp->ops->msi_host_init) { + if (pci_msi_enabled() && !pp->ops->msi_host_init) { num_ctrls = pp->num_vectors / MAX_MSI_IRQS_PER_CTRL; /* Initialize IRQ Status array */ From patchwork Tue Sep 29 10:34:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 11805555 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 567446CB for ; Tue, 29 Sep 2020 10:36:26 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 1186F207C4 for ; Tue, 29 Sep 2020 10:36:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="L7kudX2K"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="l9xyB80W" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1186F207C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=synaptics.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=T17FvwORBvIy+sBc2X3vJ9o2AVXhOBYPRnoxH3UcqwQ=; b=L7kudX2KM/oatp1hVsJnY5Yxw RsyGFVjEtbOokVLYmSmJmqeWvI3YiRBV07X0wMk3u+3YWbjyEepfZ6vXu0xuTLa2c5IwJ+Y4iRDeB 8p+nAGAN1efy8nmuQ36wtTGn7ehFPqRpvECmY/riueIElZ7e88swnzOqCmjky0Z0GnaG2B/QV4Kgz vg+Vq7vrHpTedu/zJ8m1wHHQhv0gatNvCUp640S+a7VpYBmH3Ptao3R6cRq/NgIYJLXT6k3EGyVg7 eKAX63wipoRgt1zFbqZJhtKOTZ3zZa9/llA/GvU3Xg+ZhhFnKcqFSVE+KNl3EnyD03PzV35TBVbVO CYvzdPgUA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNCzU-0000TO-Jj; Tue, 29 Sep 2020 10:36:12 +0000 Received: from mail-bn8nam12on2052.outbound.protection.outlook.com ([40.107.237.52] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNCzR-0000Rz-1h for linux-arm-kernel@lists.infradead.org; Tue, 29 Sep 2020 10:36:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HNr3R4kgHQ+0In2grDv5NLYRmpFKpyuD0MYmzu0gIxqyhamFuGDf9zBRv076iPCUb/qqEL0PA3LovlvRiSNkh0ZcW5iv2xJmkTIHD6dX8Z2en4FpzFm0ysQoY+16P9IKzd+84TnFsrO4iILph5odsQJ/joqO4+mC9G6+kP8WWb1Z+r84xFWlyBQd5Wbyp6DiYSmLZ6BGb7VM9V1XBr9FcHj+5kkhs6jzfcyRMHmAo88V/7Gu0tgpRqRL8KbDi1Qoq6KG6Ciq3MnAQtPAU1OUu6I0Ns8KCfjaII8cix7Mz4xx+bK2RJuz6fXM/1FCbQzqkimaZjed5GqDiQxVdkMABQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mLsmRuocSYHjRDfMW+H3OrXPClDCOufHTKyMVD6zYqM=; b=SgDr47P8m+76FoHQXJ3fcYazTH0SFReDlFUHLYjcR49+hPZEdUYl8XuRtUtTFyOUrNjM6gcbeYR5J7s8vwCQbBgi6sQ48scBvP0spHTdfe4JRpNZhE3g+57BG1cmN9PUsuIccNr86nVBeIErFU4/dUQiNGyYzXyR5EjH7vWBMu7wD1dQJRXRPooQXqtHvnx/cnUgAqnLlX3/cjjIHGeT99+MGm5T9UvjGJthOEiXFGuEsiopM1TNUn/VcXMGG+IjLKfT0jkf8CFsI3GFHQw9QsVHlNE5intxM5JLpsmmexR4JUHOc1V5HKv7xJNSul4ifksEWZ+klK2Ax1hwKFj8fw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=synaptics.com; dmarc=pass action=none header.from=synaptics.com; dkim=pass header.d=synaptics.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector2-Synaptics-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mLsmRuocSYHjRDfMW+H3OrXPClDCOufHTKyMVD6zYqM=; b=l9xyB80WwENpAQKt+/Q03mSUDvMu1wM+bR/Nz3n/3nAHH0/pXjHw6LKzwAva7tZNo4kA1F27ORQNHuNUuSa0uukf9NjzTRW9j7Yq4wMZzNBXJljK9kJyK39nt9MxrhnLG1/zsJjg5B0F8kWUda2x9+n3UyNdhHVQ9mLfn9Um82o= Authentication-Results: ti.com; dkim=none (message not signed) header.d=none;ti.com; dmarc=none action=none header.from=synaptics.com; Received: from DM6PR03MB4555.namprd03.prod.outlook.com (2603:10b6:5:102::17) by DM6PR03MB5292.namprd03.prod.outlook.com (2603:10b6:5:240::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.32; Tue, 29 Sep 2020 10:36:07 +0000 Received: from DM6PR03MB4555.namprd03.prod.outlook.com ([fe80::e494:740f:155:4a38]) by DM6PR03MB4555.namprd03.prod.outlook.com ([fe80::e494:740f:155:4a38%7]) with mapi id 15.20.3433.032; Tue, 29 Sep 2020 10:36:07 +0000 Date: Tue, 29 Sep 2020 18:34:58 +0800 From: Jisheng Zhang To: Kishon Vijay Abraham I , Lorenzo Pieralisi , Rob Herring , Bjorn Helgaas , Jingoo Han , Gustavo Pimentel , Ard Biesheuvel Subject: [PATCH v4 2/2] PCI: dwc: Fix MSI page leakage in suspend/resume Message-ID: <20200929183458.37f91a38@xhacker.debian> In-Reply-To: <20200929183403.060d1853@xhacker.debian> References: <20200929183403.060d1853@xhacker.debian> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-pc-linux-gnu) X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TYBP286CA0025.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::13) To DM6PR03MB4555.namprd03.prod.outlook.com (2603:10b6:5:102::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from xhacker.debian (124.74.246.114) by TYBP286CA0025.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.32 via Frontend Transport; Tue, 29 Sep 2020 10:36:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 92883639-5d06-48b2-25a1-08d864637920 X-MS-TrafficTypeDiagnostic: DM6PR03MB5292: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4i0HGzLOkqZ78x7yuvzSXEPxkmKD7l8ntVbsE+jAEhGi0nAuWpx5H8hRm8QE51nNs2umflTnbrPjXulGyGaydiCjJtmFFlXGCU+BFgqR6ESPy5S+UlxElv2kroBlNl4iD7MP2SYyzjNZ48f42joEqxugxx6F1S3Y2IF1a4u1EEHaCFHiN8w5VC/Ihrsqzc7mNlaTkxzDU4KBv3d6uJw14CQUsKX3caWaFcVL/h+5ZTwM8nt+G7FJuWCF+JIM49VrLj3Ab/d4vO/CwhcU37llsARRV3hAFbwe79uAa34hjyJ82JYmpFAW1aEZZB7kseO6/pO++gULiMpwvNY5aS4Lrw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR03MB4555.namprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(136003)(346002)(376002)(39860400002)(366004)(4326008)(6506007)(186003)(8936002)(16526019)(26005)(55016002)(9686003)(8676002)(7696005)(52116002)(86362001)(66946007)(66556008)(66476007)(478600001)(5660300002)(1076003)(6666004)(956004)(110136005)(316002)(15650500001)(2906002)(83380400001)(7416002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: s7Jsrq+yUJhYXOfNrHXQapgRyOzicXleWYUScjoGl07WeSzGpq59cAWnSNJmYEhnVu+zLmUkEhgTYoulIrODRSna9HG+tK5lcClK8h0RMY7Jlj7A6DN/BBq5M4EPGxY2EUM4e1uUaDi9guNfHuPTCh+yd8gcpeFz1/+jqKAhQFjyc97DrG/V1/BcR7UrL4UP9Qsq1jUj5tWqpebNXv45TJ7w0rK6BWenvmGwEvmLQf0YxlohnuPLZpi4dgj8OxQjYTsjMUqIsPQKLsWeSoSQ/zFN5MKGfgMbZFpa/PI2FdYuj7YUzQZzPzxtlKRM1UF5B9LCAMHnPATgqLiMmqdl6BMBcyQwK11gIrKMCnC5ZyhJMgpKGV0ZCOA5iNM8jMGMS8eVv/hQ9aHqkBR1zHwCKL2Lf+eySVnicKXsan0g3yE6PhR9Hb2b3IgMp80nlK0fVqIAGUBDYUuei4VUAHuksm9wUyiYheFDeNdx7zmRzBBcUfJ2qoIS1SOqhhVfkF1RNUi25c3UEaBb/5WVhmqI2nXJ+qeIzUblZs6DpzESJD5x0qBOw9QvvxVgYBS0sIMtZCz2ttj+qzgcKwEXMrVMNlK6xe9sBz9viEmYo39ER1eSTvn5GhnAlzvwxqp2u3YHSgtOYGFi/UhwhAWHDixSsw== X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92883639-5d06-48b2-25a1-08d864637920 X-MS-Exchange-CrossTenant-AuthSource: DM6PR03MB4555.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2020 10:36:07.3892 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QhkAgvVIeAx++P0yOqe9xfm5H52RzYMCb2c0oUvum0SsP8dr6hZzkcEpSDAc5iEqHGSsb+cB6cOKqLTCZzMq0Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB5292 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200929_063609_104152_947CB5FF X-CRM114-Status: GOOD ( 19.83 ) X-Spam-Score: -0.6 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.6 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.237.52 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.237.52 listed in list.dnswl.org] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pci@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Currently, dw_pcie_msi_init() allocates and maps page for msi, then program the PCIE_MSI_ADDR_LO and PCIE_MSI_ADDR_HI. The Root Complex may lose power during suspend-to-RAM, so when we resume, we want to redo the latter but not the former. If designware based driver (for example, pcie-tegra194.c) calls dw_pcie_msi_init() in resume path, the msi page will be leaked. As pointed out by Rob and Ard, there's no need to allocate a page for the MSI address, we could use an address in the driver data. To avoid map the MSI msg again during resume, we move the map MSI msg from dw_pcie_msi_init() to dw_pcie_host_init(). Signed-off-by: Jisheng Zhang --- drivers/pci/controller/dwc/pci-dra7xx.c | 16 +++++++++- .../pci/controller/dwc/pcie-designware-host.c | 32 +++++++++---------- drivers/pci/controller/dwc/pcie-designware.h | 2 +- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c index dc387724cf08..688e5e88784e 100644 --- a/drivers/pci/controller/dwc/pci-dra7xx.c +++ b/drivers/pci/controller/dwc/pci-dra7xx.c @@ -490,7 +490,9 @@ static struct irq_chip dra7xx_pci_msi_bottom_irq_chip = { static int dra7xx_pcie_msi_host_init(struct pcie_port *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct device *dev = pci->dev; u32 ctrl, num_ctrls; + int ret; pp->msi_irq_chip = &dra7xx_pci_msi_bottom_irq_chip; @@ -506,7 +508,19 @@ static int dra7xx_pcie_msi_host_init(struct pcie_port *pp) ~0); } - return dw_pcie_allocate_domains(pp); + ret = dw_pcie_allocate_domains(pp); + if (ret) + return ret; + + pp->msi_data = dma_map_single(dev, pp->msi_msg, sizeof(pp->msi_msg), + DMA_FROM_DEVICE); + ret = dma_mapping_error(dev, pp->msi_data); + if (ret) { + dev_err(dev, "Failed to map MSI data\n"); + pp->msi_data = 0; + dw_pcie_free_msi(pp); + } + return ret; } static const struct dw_pcie_host_ops dra7xx_pcie_host_ops = { diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index f08f4d97f321..27bbeee5718f 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -288,26 +288,17 @@ void dw_pcie_free_msi(struct pcie_port *pp) irq_domain_remove(pp->msi_domain); irq_domain_remove(pp->irq_domain); - if (pp->msi_page) - __free_page(pp->msi_page); + if (pp->msi_data) { + struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct device *dev = pci->dev; + dma_unmap_single_attrs(dev, pp->msi_data, sizeof(pp->msi_msg), + DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); + } } void dw_pcie_msi_init(struct pcie_port *pp) { - struct dw_pcie *pci = to_dw_pcie_from_pp(pp); - struct device *dev = pci->dev; - u64 msi_target; - - pp->msi_page = alloc_page(GFP_KERNEL); - pp->msi_data = dma_map_page(dev, pp->msi_page, 0, PAGE_SIZE, - DMA_FROM_DEVICE); - if (dma_mapping_error(dev, pp->msi_data)) { - dev_err(dev, "Failed to map MSI data\n"); - __free_page(pp->msi_page); - pp->msi_page = NULL; - return; - } - msi_target = (u64)pp->msi_data; + u64 msi_target = (u64)pp->msi_data; /* Program the msi_data */ dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_LO, 4, @@ -440,6 +431,15 @@ int dw_pcie_host_init(struct pcie_port *pp) irq_set_chained_handler_and_data(pp->msi_irq, dw_chained_msi_isr, pp); + pp->msi_data = dma_map_single_attrs(pci->dev, &pp->msi_msg, + sizeof(pp->msi_msg), + DMA_FROM_DEVICE, + DMA_ATTR_SKIP_CPU_SYNC); + if (dma_mapping_error(pci->dev, pp->msi_data)) { + dev_err(pci->dev, "Failed to map MSI data\n"); + pp->msi_data = 0; + goto err_free_msi; + } } else { ret = pp->ops->msi_host_init(pp); if (ret < 0) diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h index f911760dcc69..cd9e76904c58 100644 --- a/drivers/pci/controller/dwc/pcie-designware.h +++ b/drivers/pci/controller/dwc/pcie-designware.h @@ -194,8 +194,8 @@ struct pcie_port { int msi_irq; struct irq_domain *irq_domain; struct irq_domain *msi_domain; + u16 msi_msg; dma_addr_t msi_data; - struct page *msi_page; struct irq_chip *msi_irq_chip; u32 num_vectors; u32 irq_mask[MAX_MSI_CTRLS];