From patchwork Wed Nov 9 18:46:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13037929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 392BEC433FE for ; Wed, 9 Nov 2022 18:47:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=57Rt/MZzs+0ds1+UPOSbIchfjtaXNxWWGXHTyPLIkPE=; b=BXj4b8YCuiZdj1 bBY3h2n75x89f+S5JMT9RdNTuwysFAfBGyGMW+81SXE6tpCMYGzvG1kNPHffcwjrUMA5gPbGQGdvg GDVHyV6ft3CdE+X2Xi+1BDyV+Onj2BpUMNB/o/cRYcetZ8RHkYiKXLsYWy5y106QbiOm9rwKHJ6nm EVbJqR84YrJr9A/ILDOEKC2Y8OyA0yxcQFmGhCVm8SZWupqDsIv0oFX1LpqoJZ4FOyR0hXP0cZEOK 6bWEzkYVdJWB67di05DfqXk5cGBJ0aM2f7MkkgsOKNBH86flhw+1FdQc1rvgTgTF/vAJphCFXD712 TcAouA3c4tABcnylx8bQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1osq6A-00GIH7-MB; Wed, 09 Nov 2022 18:46:54 +0000 Received: from mail-mw2nam12on2062.outbound.protection.outlook.com ([40.107.244.62] helo=NAM12-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1osq68-00GIFf-8d for linux-arm-kernel@lists.infradead.org; Wed, 09 Nov 2022 18:46:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NwA2P6+S+LvN797qqVzOyvXsmc1lGxeljUTSscDnwad7Ha7QNT1hbJ5KCNwC3eodhPGDIsLbcHXAH43h0AMSJZxhnvk9Gkmplu5+8s1Yarcz/+ww0XqMEp4BTC/l/GZBJqu0R0V1vO5PrjAQCaA9+OKBTRTSeru8jfix3CBcbqHum4d5S4abZ123/Zwdv8NF6T0LCFdTIyTCCXSj1utoj0LERs45CBsibgJVar8B6cbHPJ2tplcfFRdxmvSAuTFdaXSgysi+1VT3vhQr72mxHO3cj5nl+TCh+YX5SvtGRqf7eQOYMlUgl7yvXqmaZB5URl1ASHeoYQc2nsu2arcQoQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UTFb8DCOrGAqfVdbPqQyec4vKZZ/ZflXFnusB2GJrgc=; b=ka+QTx7ASWgTlygVYuiwp1ZsrkduuMlIyQTXA5ldREgc5LBacI2gDDTubJQBZgNAyBz+4TjW2nwqOkb561HQJff1nGOskyjeW2bw9E+qIp7L3wC0tgxBLB96lDI+NypgMM1C1hJCY2zxTq1mhgNgVno/qwr18RPK6/g9fBvc/KoZrPpKP9PaHz8yS59/gsRPlkqij0QnV+tKZCGPo4vJoqSMMx4U7gD2x3SpkKc/CGcFDDTEiVXCdxmp2GG9HcK6ai7BN33Y10lrhAyqlfPDxgbEDjnRK/T+2BOdwo4vhGfVCW9hwNwjFuoVcN/5iHwBAUxjZigG+WgjGeHuAtzS6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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 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=UTFb8DCOrGAqfVdbPqQyec4vKZZ/ZflXFnusB2GJrgc=; b=EvmTAh4EMrmZOmlmaAvclie0SfX1QGWFVpYEAFg6d4nNLLEorFIOUUdDjw2fG30Lrdxn0XNhUrV2ekFuGwYQWf0Y461MjBAhjRIsMSgnjaK5W4zZo8lUZzXtG4s+/yvIOMCg6u/raLnAMpVvK6/Aa+OqUWik0Je7o9I2rG32HMza5NX5dmVyirXpodsJb2HsAKzogPN04kiI/MADe1c0/Je4ZvEC7BJLrCiqHasDBLoowzqDvgFHn5AI/VOZ8zPB7aROoQSx4EiilCsnRYhUWeqaiupj/Bw4/rUei1Dy9UGbZ60fDnqBOILEO80mc5ykYAqB65WOGHQqew5uDdaqPg== Received: from DS7PR03CA0353.namprd03.prod.outlook.com (2603:10b6:8:55::13) by CH2PR12MB4071.namprd12.prod.outlook.com (2603:10b6:610:7b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27; Wed, 9 Nov 2022 18:46:47 +0000 Received: from DM6NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:8:55:cafe::6f) by DS7PR03CA0353.outlook.office365.com (2603:10b6:8:55::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27 via Frontend Transport; Wed, 9 Nov 2022 18:46:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by DM6NAM11FT059.mail.protection.outlook.com (10.13.172.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12 via Frontend Transport; Wed, 9 Nov 2022 18:46:47 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 9 Nov 2022 10:46:45 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 9 Nov 2022 10:46:45 -0800 Received: from Asurada-Nvidia.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Wed, 9 Nov 2022 10:46:44 -0800 From: Nicolin Chen To: , CC: , , , , Subject: [PATCH v2] iommu/arm-smmu-v3: Restore prints in arm_smmu_attach_dev() Date: Wed, 9 Nov 2022 10:46:36 -0800 Message-ID: <20221109184636.14264-1-nicolinc@nvidia.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT059:EE_|CH2PR12MB4071:EE_ X-MS-Office365-Filtering-Correlation-Id: 6608a618-430c-4409-7609-08dac282c159 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OVg+KV3HGiWfSKXVFD38KawCA1HHNTK9Y0gIg2oAYKvlQWPwgWDCnAy/E0VabVeTvKjgjsIhplwVxqAbRjTsMpLsyFyoo8kkN/b9869oR0QExaSTBeLlp/SpnEQIoWerOf1g863CK+SKqCPsH6d8o33Cs7DCpajImM4E4sLpC+fPJrzqpS7SznDs2pajZIRjaUClZwuHz8JgzhuPjSjUVRLodedzaFTi19Guu/jGO5z9zdDwJd/y4nyD3qi3qqqcrHa5K3fufzFwQf58RpHVUbOcdHCm6VutrrbLVBhmCHyoQyRej/2PR9IFxkKXvlP1tslAETbinQvipG7pD6KeD5MuHMSvDDRv3Mu2Y5B9/cRQUoZ7a+u9zZN6E3TVN6X8+kYVWPNVjSIII11l4wLoeGL7pnMBEt/MP914d7m5+G/T7efWmvTVT2/pI2+qfw8Yyve1nVbGFcEhn3l4BT/x9ZwQxmc44plVI3Jh+KGMN9H/sRX268lHosbWCEEXQFUy1KWzd+IukoyEc0s9zYAG1UAJgAgLbacDYLjsOghLRi5gC19Yb0GAagBWoLNg8Xi+TbMp8VSx0X8q+2RzXy1wJn6PlEOj3VWyHMg2gKb6Xvc/TP+KZNXSeQlMaFWy/SuGH+ZZn94zYkdr+YvEDUngrqDYK08QGhm3mM71NbswOph5S+dbj2GSzok2UedsXsUwvHh3dBRg0MRPLRO1yb3ej4Zcko/xDPT2PKDBl/KqvUZLlbKjdv7OY/XGMOHXqoRluf9A6qTTFu57MyF+jX+sonlgYW9r9WIRLwUlfKQFSs4= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(346002)(376002)(39860400002)(451199015)(46966006)(36840700001)(40470700004)(36756003)(7636003)(356005)(82740400003)(86362001)(83380400001)(40460700003)(6666004)(40480700001)(2906002)(66899015)(7696005)(426003)(26005)(2616005)(186003)(1076003)(47076005)(36860700001)(336012)(316002)(70586007)(8676002)(478600001)(82310400005)(70206006)(110136005)(4326008)(54906003)(8936002)(41300700001)(5660300002)(473944003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2022 18:46:47.0342 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6608a618-430c-4409-7609-08dac282c159 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4071 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221109_104652_323811_A25ABD54 X-CRM114-Status: UNSURE ( 9.68 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The prints for incompatible failures in arm_smmu_attach_dev() might be still useful for error diagnosis. As VFIO and IOMMUFD would do testing attach() call, having previous dev_err() isn't ideal either. Add the prints back using dev_dbg(). Fixes: f4a147735793 ("iommu: Use EINVAL for incompatible device/domain in ->attach_dev") Suggested-by: Will Deacon Reviewed-by: Jason Gunthorpe Signed-off-by: Nicolin Chen Acked-by: Will Deacon --- Changelog v1->v2: * Add "Fixes" line and Reviewed-by from Jason drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 7 +++++++ 1 file changed, 7 insertions(+) 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 ab160198edd6..076d3710b1fe 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2433,14 +2433,21 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) goto out_unlock; } } else if (smmu_domain->smmu != smmu) { + dev_dbg(dev, "cannot attach to SMMU %s (upstream of %s)\n", + dev_name(smmu_domain->smmu->dev), dev_name(smmu->dev)); ret = -EINVAL; goto out_unlock; } else if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1 && master->ssid_bits != smmu_domain->s1_cfg.s1cdmax) { + dev_dbg(dev, + "cannot attach to incompatible domain (%u SSID bits != %u)\n", + smmu_domain->s1_cfg.s1cdmax, master->ssid_bits); ret = -EINVAL; goto out_unlock; } else if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1 && smmu_domain->stall_enabled != master->stall_enabled) { + dev_dbg(dev, "cannot attach to stall-%s domain\n", + smmu_domain->stall_enabled ? "enabled" : "disabled"); ret = -EINVAL; goto out_unlock; }