From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=pass header.oldest-pass=0 smtp.remote-ip=52.101.53.19 ARC-Seal: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=pass; t=1793596794; b=TJHz/i/f51kRj4+Kx57/f2D7XerP815VIzubMsxdoH/W3Vi+NCE31sToUmSFW5soOD8j aChVygGvSBme+eQHtI5WJnB0c8kCq37UWnti1DOqat1wFw4G4M8SUKW6sLfHMJICUKM5k G9Ocfk4ZleOxFCDf+pTzAk15tmX3c3uRoBryrsxuhAFlAyYcULCCQMnV1Uszi9rMnAM9i HSWO/dFQQqCnUo+W85MuxisyOTvPIpjYorpxEhIaL7eS9Bn5dp5AcJyQbE4Nm2KyNre1f /zhr1b8GvtF8QydLHXchicHBiWBg0M0ZURgUNkkIF+cVPH99snyhFKxld2lEcEGPe+g== ARC-Message-Signature: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793596794; h=DMARC-Filter:DKIM-Signature:Received:Received: X-MS-Exchange-Authentication-Results:Received-SPF:Received:Received: Received:Received:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding: Content-Type:X-NV-OnPremToCloud:X-EOPAttributedMessage: X-MS-PublicTrafficType:X-MS-TrafficTypeDiagnostic: X-MS-Office365-Filtering-Correlation-Id:X-MS-Exchange-SenderADCheck: X-MS-Exchange-AntiSpam-Relay:X-Microsoft-Antispam: X-Microsoft-Antispam-Message-Info:X-Forefront-Antispam-Report: X-MS-Exchange-AntiSpam-MessageData-ChunkCount: X-MS-Exchange-AntiSpam-MessageData-0:X-OriginatorOrg: X-MS-Exchange-CrossTenant-OriginalArrivalTime: X-MS-Exchange-CrossTenant-Network-Message-Id: X-MS-Exchange-CrossTenant-Id: X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: X-MS-Exchange-CrossTenant-AuthSource:X-MS-Exchange-CrossTenant-AuthAs: X-MS-Exchange-CrossTenant-FromEntityHeader: X-MS-Exchange-Transport-CrossTenantHeadersStamped; bh=pICSg7mFZPqkrNVUiaMgHHQmaQDHmOfkVU6OPXiw+BA=; b=DVx+tm9rpjv7j7u60pdx6xVZwsuAvcqGImn3xRUXH4znAYRvS8hjseC8dTvIZEMyaQej ioWrOLJ0cOcn+Zx1V4ODThQyGs1AnKDqKOV/4acxW9kUatu1zvIJDEeOwv9Is5IiHxWsd L9uSbc1uEW8blJ9t0TY/aAjaXtGS6RY9du7Tmt4xxquOa/K/XHeD9E6LA4/oVco0VpVk9 izVHSCp6k9TTPFfXWgJXbbA1XFaKwpYXmV89ySU+wVwv4yr7r6JeHLp0dsCrZOs94VQen doN8+SjwI0Vl9F0K9WKZYaBZh3BBO/bfbJktNV9d15KmQfxAZzUX0BReQu8pSnmwZsg== ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=BxUtDmxk; arc=pass header.oldest-pass=0 smtp.remote-ip=52.101.53.19 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012019.outbound.protection.outlook.com [52.101.53.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (secp384r1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C407606A324 for ; Mon, 2 Nov 2026 05:19:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 9C407606A324 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=BxUtDmxk ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RTHi/4oHuLymsX8/aq5R9aLpLPcdR4R+/G7n35FG/MIGWQq01F2eQcuIDc/7RGuJGPRm+InnRgni6TdZfxHbusKPMsUqx8pC3VgKPLlknqBBgXBauYeIqjPBUMlYr0UY9a0DgapLT23NjrnT9cEwqelm+a1LlgD3D88t94g519f0RD8fUv9OIsnsoOWVpGbc0QL4LORqSQ8pWFX1es+s5eDiANJVixtDNc2kSWDKFyT4I563FU38SYRgCHpgEdsktZ/OjpbFxaNm7ZpaWQMp1NIWJb/fxIgySh+rTdbewq5kPxXdB8g4IVtumkoqxCt/PR0TqVgmJAjSi4SU1xkqzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pICSg7mFZPqkrNVUiaMgHHQmaQDHmOfkVU6OPXiw+BA=; b=Jm5462zw4cIUC03DiyUi1dx32HoJSFgharaU4Aj9DlaZlFuFDN644ydHlXNbsM5sDuQzLrWQk4QlXWGo4NDhvF45D9BjS3OmW/u5UvDLFFqi+fwFn7f+dyzFu+3TcXTHED8mD1mUYWBR6/wIlkwiRZ9lZ7ExxAGbqZXHXb59k2rFSqRMybcv1R0Nhb0fSt5cuu4KvJPD95dR1V3/tCxeRpIIB2WfhIZpVx1Q87lN6Hxe1YBRYMSMy8FJmRIT4Pj3J4vMjXvpP1nNQUUY6BBoLE8JJuCxGcllHH1cJEhtUP+LDe10BoXqgxEH9WJ2SvdPCYqGtC6e2ZkWycjwnu2VwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pICSg7mFZPqkrNVUiaMgHHQmaQDHmOfkVU6OPXiw+BA=; b=BxUtDmxkysJzFb/1yEjnHrFCglRbZr3hFTeoYSvwo17oKHQWve72sNH5e0oi7l5sA+QUCFL9ptZoKemM5DXERUcini77N/mrJJiCQwuXYeOlj9rLA/30fuDuXiuEO/q2UmxmGj9/ZZmOWVQGAokSmXN5xSe9z+B7LYl3tXzBCTWDi1/+VukXUJuX5hZvBn4xl9QJVL3Xoga61APRb6C4KDHSFvB4EXa01yDFiqAAryrQlAjW2aBI187tvg7SoDPyhtzeCyHBYHr8qprJB+iV2ElMj8gFFMvsAJHdkodqGzn4e6v4fJGuc5gj47xLLhTOOp8HpAc24moZqJZZbzZLuA== Received: from PH1PEPF00013304.namprd07.prod.outlook.com (2603:10b6:518:1::16) by IA0PPFAF883AE17.namprd12.prod.outlook.com (2603:10b6:20f:fc04::be1) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.569.12; Mon, 2 Nov 2026 05:19:47 +0000 Received: from BY1PEPF0001AE1C.namprd04.prod.outlook.com (2a01:111:f403:c902::17) by PH1PEPF00013304.outlook.office365.com (2603:1036:903:47::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.569.12 via Frontend Transport; Mon, 2 Nov 2026 05:19:46 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BY1PEPF0001AE1C.mail.protection.outlook.com (10.167.242.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.5 via Frontend Transport; Mon, 2 Nov 2026 05:19:46 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.56; Sun, 1 Nov 2026 21:19:35 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.56; Sun, 1 Nov 2026 21:19:34 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.2562.56 via Frontend Transport; Sun, 1 Nov 2026 21:19:33 -0800 From: Nicolin Chen To: , CC: , , , , , , , , , , Cristian Prundeanu , Breno Leitao , , Subject: [PATCH v12 05/12] iommu/arm-smmu-v3: Add ARM_SMMU_FEAT_EVTQ for the event queue Date: Sun, 1 Nov 2026 21:19:13 -0800 Message-ID: <9744e1695bc597bd9ddb88ace69ffb584b803425.1793593923.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF0001AE1C:EE_|IA0PPFAF883AE17:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d82ac73-1f5d-47ee-867b-08df38a0e93e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|82310400026|23010399003|7416014|376014|1800799024|6133799003|10067099003|18002099003|22082099003|56012099006|5023799004|11063799006|261021121427099003|261021123027099003|261021135927099003|261022075727099003|261026140227099003|261022105027099003|261009223027099003|261028144727099003; X-Microsoft-Antispam-Message-Info: jIgUO1jFub9GRVi2yi1ZwsfKM2d1XRUtBXeBFaKxqN6EsgBzety+FzrLKn3QTxH5fOmg8N86VtzoyKBGEEoNpxzDrhBjrk1UeoASm9Sz5rX7MHskQ2YyzTPGRhUoAoyv8mj9A+9dH2eoDBgVPWMhl40EboE23z8fCi3FVYhc/Y3u7Ct7XYlfQ9S9mza7BTsNoOtlnlyyJD3ERHilcDV6aZYyT0Cj1T0xrfR+c8mfVGAau17QDuj3dMv57yVCE94wMU9LGgjTtbMNHsaY5fEvBrcQ8K032FjdycVmpmjcFep78bdNoga9vwIb8drbvNsDiwyF1WSo6txGQzc+dDKrvOkAUmiz5vL8aapVykxHXkhyFcWxkYtEmFF8oF7q25QQGweTNwaXQ6WYj7xVfvGBB+h0aWHyCkYy/tMRw5Y9dPZEbn6zQRXFwekozjXBTWbTb4JJsPAhjeH+qKhsakIuNM8hg1fUMGI3wmy5uT26pl6PDKLfViWkq3+akTones+kQVf7oesMZm03iqHnly6WT2rJ5Lih6siy95sTjLrnKT4TuULjONsRm/0z9MMSd2XFZFjWkA6SwrHUaaO+HL2n++KkXTfSKaAwwY2+P72NDqkwkub3jcbyWBsO9sHyWguRZVqFGct9h9unzAckD7eoqHr1rfIQmVKxUt3OwL0RVMYjOMPR9WVhXOzYE+Tbi4U3TYhNTzUHURq9VBKkyv7obQ== X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700016)(82310400026)(23010399003)(7416014)(376014)(1800799024)(6133799003)(10067099003)(18002099003)(22082099003)(56012099006)(5023799004)(11063799006)(261021121427099003)(261021123027099003)(261021135927099003)(261022075727099003)(261026140227099003)(261022105027099003)(261009223027099003)(261028144727099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0BNf4XvHwS5oebgpvrDcgXH4yHoEGnCxWnqVu6W2fc8l4Pj0RAAskogyvZqcaNx3SQONP4z2WiSVPC1p7oHRV0hcsTViOat91sEDfOR81U0Z6fO0rI3ykcbpeTqrTg8OndOaTNiipABauWQrFlVbUXx5l5wBHf2qMfMRqFpStnPA8Oy/6SjOQ7i55pj+cV0X9pmS4dHqS7khnzr8bjXXv6HG4xqLNMh0fgjF4I/TUuOrq8DWhga+E720BW89dUUz1Um0felda+BNQ4ndNNKSZBQoJJjY2wc6T69vn3hOmYqLmIbtUHAJ/I77gfBYLnOVedq5GbnuKQbao6T+6U2FOGoeXPKCZAhkbkGMFB9lZPy2akWU6bXQHzSJxKQ6mCIUMRJxS3Nqc95r0aH01AIlky8tQu8D3neDXeDIkKwHVYHUa0j9nQR5xrVkovCXk8Fl X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2026 05:19:46.8417 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d82ac73-1f5d-47ee-867b-08df38a0e93e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF0001AE1C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PPFAF883AE17 The driver programs and enables the event queue unconditionally, while the PRI queue has an ARM_SMMU_FEAT_PRI gating each of its touch points. Yet a kdump kernel wants to leave both of the queues alone, which would take an is_kdump_kernel() test at every one of those places. Add an ARM_SMMU_FEAT_EVTQ that the probe always sets, as the event queue is architecturally mandatory, and gate the queue's allocation, its interrupt, its MSI vector, and its CR0 and IRQ_CTRL enables on it. A subsequent change will turn the queue off in a single place. No functional change intended. Suggested-by: Jason Gunthorpe Suggested-by: Robin Murphy Acked-by: Kiryl Shutsemau (Meta) Reviewed-by: Jason Gunthorpe Reviewed-by: Mostafa Saleh Tested-by: Breno Leitao Tested-by: Cristian Prundeanu Tested-by: Shuai Xue Signed-off-by: Nicolin Chen --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 82 +++++++++++++-------- 2 files changed, 54 insertions(+), 29 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index bce592fff0b12..aef12d8de9f05 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -979,6 +979,7 @@ struct arm_smmu_device { #define ARM_SMMU_FEAT_BBML2 (1 << 24) #define ARM_SMMU_FEAT_HAFT (1 << 25) #define ARM_SMMU_FEAT_DS (1 << 26) +#define ARM_SMMU_FEAT_EVTQ (1 << 27) u32 features; #define ARM_SMMU_OPT_SKIP_PREFETCH (1 << 0) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index a312984bc6a0e..b1222d6f771cf 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2374,7 +2374,8 @@ static irqreturn_t arm_smmu_combined_irq_thread(int irq, void *dev) { struct arm_smmu_device *smmu = dev; - arm_smmu_evtq_thread(irq, dev); + if (smmu->features & ARM_SMMU_FEAT_EVTQ) + arm_smmu_evtq_thread(irq, dev); if (smmu->features & ARM_SMMU_FEAT_PRI) arm_smmu_priq_thread(irq, dev); @@ -2383,7 +2384,12 @@ static irqreturn_t arm_smmu_combined_irq_thread(int irq, void *dev) static irqreturn_t arm_smmu_combined_irq_handler(int irq, void *dev) { - arm_smmu_gerror_handler(irq, dev); + struct arm_smmu_device *smmu = dev; + irqreturn_t ret = arm_smmu_gerror_handler(irq, dev); + + /* Without either queue, the thread would have nothing to drain */ + if (!(smmu->features & (ARM_SMMU_FEAT_EVTQ | ARM_SMMU_FEAT_PRI))) + return ret; return IRQ_WAKE_THREAD; } @@ -4756,11 +4762,14 @@ static int arm_smmu_init_queues(struct arm_smmu_device *smmu) return ret; /* evtq */ - ret = arm_smmu_init_one_queue(smmu, &smmu->evtq.q, smmu->page1, - ARM_SMMU_EVTQ_PROD, ARM_SMMU_EVTQ_CONS, - EVTQ_ENT_DWORDS, "evtq"); - if (ret) - return ret; + if (smmu->features & ARM_SMMU_FEAT_EVTQ) { + ret = arm_smmu_init_one_queue(smmu, &smmu->evtq.q, smmu->page1, + ARM_SMMU_EVTQ_PROD, + ARM_SMMU_EVTQ_CONS, + EVTQ_ENT_DWORDS, "evtq"); + if (ret) + return ret; + } if ((smmu->features & ARM_SMMU_FEAT_SVA) && (smmu->features & ARM_SMMU_FEAT_STALLS)) { @@ -4955,7 +4964,8 @@ static void arm_smmu_setup_msis(struct arm_smmu_device *smmu) unsigned int nvec = 0; int ret; - arm_smmu_setup_msi_vector(smmu, vec, &nvec, EVTQ_MSI_INDEX); + if (smmu->features & ARM_SMMU_FEAT_EVTQ) + arm_smmu_setup_msi_vector(smmu, vec, &nvec, EVTQ_MSI_INDEX); arm_smmu_setup_msi_vector(smmu, vec, &nvec, GERROR_MSI_INDEX); if (smmu->features & ARM_SMMU_FEAT_PRI) arm_smmu_setup_msi_vector(smmu, vec, &nvec, PRIQ_MSI_INDEX); @@ -4991,16 +5001,20 @@ static void arm_smmu_setup_unique_irqs(struct arm_smmu_device *smmu) arm_smmu_setup_msis(smmu); /* Request interrupt lines */ - irq = smmu->evtq.q.irq; - if (irq) { - ret = devm_request_threaded_irq(smmu->dev, irq, NULL, - arm_smmu_evtq_thread, - IRQF_ONESHOT, - "arm-smmu-v3-evtq", smmu); - if (ret < 0) - dev_warn(smmu->dev, "failed to enable evtq irq\n"); - } else { - dev_warn(smmu->dev, "no evtq irq - events will not be reported!\n"); + if (smmu->features & ARM_SMMU_FEAT_EVTQ) { + irq = smmu->evtq.q.irq; + if (irq) { + ret = devm_request_threaded_irq(smmu->dev, irq, NULL, + arm_smmu_evtq_thread, + IRQF_ONESHOT, + "arm-smmu-v3-evtq", smmu); + if (ret < 0) + dev_warn(smmu->dev, + "failed to enable evtq irq\n"); + } else { + dev_warn(smmu->dev, + "no evtq irq - events will not be reported!\n"); + } } irq = smmu->gerr_irq; @@ -5033,7 +5047,7 @@ static void arm_smmu_setup_unique_irqs(struct arm_smmu_device *smmu) static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu) { int ret, irq; - u32 irqen_flags = IRQ_CTRL_EVTQ_IRQEN | IRQ_CTRL_GERROR_IRQEN; + u32 irqen_flags = IRQ_CTRL_GERROR_IRQEN; /* Disable IRQs first */ ret = arm_smmu_write_reg_sync(smmu, 0, ARM_SMMU_IRQ_CTRL, @@ -5059,6 +5073,8 @@ static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu) } else arm_smmu_setup_unique_irqs(smmu); + if (smmu->features & ARM_SMMU_FEAT_EVTQ) + irqen_flags |= IRQ_CTRL_EVTQ_IRQEN; if (smmu->features & ARM_SMMU_FEAT_PRI) irqen_flags |= IRQ_CTRL_PRIQ_IRQEN; @@ -5177,16 +5193,21 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu) smmu, arm_smmu_make_cmd_op(CMDQ_OP_TLBI_NSNH_ALL)); /* Event queue */ - writeq_relaxed(smmu->evtq.q.q_base, smmu->base + ARM_SMMU_EVTQ_BASE); - writel_relaxed(smmu->evtq.q.llq.prod, smmu->page1 + ARM_SMMU_EVTQ_PROD); - writel_relaxed(smmu->evtq.q.llq.cons, smmu->page1 + ARM_SMMU_EVTQ_CONS); - - enables |= CR0_EVTQEN; - ret = arm_smmu_write_reg_sync(smmu, enables, ARM_SMMU_CR0, - ARM_SMMU_CR0ACK); - if (ret) { - dev_err(smmu->dev, "failed to enable event queue\n"); - return ret; + if (smmu->features & ARM_SMMU_FEAT_EVTQ) { + writeq_relaxed(smmu->evtq.q.q_base, + smmu->base + ARM_SMMU_EVTQ_BASE); + writel_relaxed(smmu->evtq.q.llq.prod, + smmu->page1 + ARM_SMMU_EVTQ_PROD); + writel_relaxed(smmu->evtq.q.llq.cons, + smmu->page1 + ARM_SMMU_EVTQ_CONS); + + enables |= CR0_EVTQEN; + ret = arm_smmu_write_reg_sync(smmu, enables, ARM_SMMU_CR0, + ARM_SMMU_CR0ACK); + if (ret) { + dev_err(smmu->dev, "failed to enable event queue\n"); + return ret; + } } /* PRI queue */ @@ -5334,6 +5355,9 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) u32 reg; bool coherent = smmu->features & ARM_SMMU_FEAT_COHERENCY; + /* The event queue is architecturally mandatory, unlike the PRI queue */ + smmu->features |= ARM_SMMU_FEAT_EVTQ; + /* IDR0 */ reg = readl_relaxed(smmu->base + ARM_SMMU_IDR0); -- 2.43.0