Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp464996pxu; Tue, 5 Jan 2021 16:45:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyV1rLphQ0Rlv69VZiygvel+JcsqJnQVLDzoaLqSaEOz7saK1AFKF2PZSnUn6RSYZz27DNY X-Received: by 2002:a05:6402:5112:: with SMTP id m18mr188812edd.129.1609893923851; Tue, 05 Jan 2021 16:45:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609893923; cv=none; d=google.com; s=arc-20160816; b=mLfbBkLgEfahQaMN0BskwQ/wz8iC//jJY58EpOp/lRJQswnnN9TluA9yb6f3XmSQHq CCDbKLniUK01PZ/NkDFMT0PT5Q/3js7lVUlZqFayT4CQrf8SAzDHuqZasGveijd+/U1O 3FzU9xfET//S3PTBKYR6gqvxtPOj6CQzRsLcHDHoqtuFj7I91MAAzVRg7tgHOlcMlx/w 2SdDnFL+4X7Itd+scVXL1CUNRj11/AnbvrLZgzL9Mdm6mlzvXmQqMZgtzDXIIy/t+nhu zTG+T8K8NR0v+z2SF7Y9GcfljI3f7kk8+Dk/MRXWoYqyeB1GKftCgcNGl7WZiI4yMuLC /vYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IakzoLbo5BkSAVvyIl2ESHTC2oLWf7d8kz2e2j8awgI=; b=GyS0VYistYxp13yOHzfvTz+p7Li6n3HBt4o1UgGMY35cEW7gWzQ0GfCup0Z68tA1Rb gTCT/nD1Tu+oYraljFh6g5CARPlz5VZMYGo8y+fxiSML4rZ8rD0+fSYDRKPLMVSeUwkt j0PmXiKUCgfSbn6SS1S+Skw6X8vqyiL6m6EgCymfe2hcF8w10NRh/GJqIwqK0U+l21uI ZJSWdgJRwjquDbua9Dbx7Gb8Q1GvT1zRSsi9d51QiRpIdKU87xF+VHIoPa9930t7yB7S AZGqtPvnnzO4GtfUnODX8Yw32a/s4JskyMN6yGNs8L6kt5d/YHFx2crzIMsGvIYpEUTG i75w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IBNd20ms; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g21si313147edp.95.2021.01.05.16.45.01; Tue, 05 Jan 2021 16:45:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IBNd20ms; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731711AbhAEWIX (ORCPT + 99 others); Tue, 5 Jan 2021 17:08:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:40144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729536AbhAEWHw (ORCPT ); Tue, 5 Jan 2021 17:07:52 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 48D9322DFB; Tue, 5 Jan 2021 22:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609884432; bh=eSEXOr41V/dBpsepFxXoVybj3TSEep3A1pAtN7NQDEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IBNd20msi0GKzy9EZ413szRxyQFByA2T3rvR8Vutp/ZAo0nM1NBs3LGyr/A0twlKf Weg5Lk8+/BeFIvXhpp3uqjFihD4fwDB6YKzqr+w39ZmACRNObBtoMLk2vkcc6wfdgg vFbaNRZULRaGgTGrsJXcBGoMwWLOIZOQC3J5R6oMOtr0gMEylqvNXd19a8m/tj0jLk j8IuzwtmuSigav1t4ghngbinXLg2yyxAPZsRncva55j8OTtTSv13pcyUqVWtzVX8mo eDQdDiqBSCW/gtw3K7mW5PyD3ZiVEg4YJjm8w8Tt04S/cpMc6mnBSgRkhBLCp2SvSv 8SlWzg3Lc+ACg== From: Will Deacon To: Borislav Petkov , iommu@lists.linux-foundation.org, David Woodhouse Cc: catalin.marinas@arm.com, kernel-team@android.com, Will Deacon , Thomas Gleixner , "Rafael J. Wysocki" , Greg Kroah-Hartman , lkml Subject: Re: [PATCH] iommu/amd: Set iommu->int_enabled consistently when interrupts are set up Date: Tue, 5 Jan 2021 22:07:01 +0000 Message-Id: <160987442134.30234.7295735708927658122.b4-ty@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <50cd5f55be8ead0937ac315cd2f5b89364f6a9a5.camel@infradead.org> References: <20210104132250.GE32151@zn.tnic> <20210104232353.GJ32151@zn.tnic> <50cd5f55be8ead0937ac315cd2f5b89364f6a9a5.camel@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 05 Jan 2021 01:32:51 +0000, David Woodhouse wrote: > When I made the INTCAPXT support stop gratuitously pretending to be MSI, > I missed the fact that iommu_setup_msi() also sets the ->int_enabled > flag. I missed this in the iommu_setup_intcapxt() code path, which means > that a resume from suspend will try to allocate the IRQ domains again, > accidentally re-enabling interrupts as it does, resulting in much sadness. > > Lift out the bit which sets iommu->int_enabled into the iommu_init_irq() > function which is also where it gets checked. Applied to arm64 (for-next/iommu/fixes), thanks! [1/1] iommu/amd: Set iommu->int_enabled consistently when interrupts are set up https://git.kernel.org/arm64/c/12bc4570c14e Cheers, -- Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev