From nobody Wed Jun 17 01:34:37 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 056AF377579 for ; Tue, 28 Apr 2026 21:41:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777412519; cv=none; b=MGbDFldcgvi49RrmrymgJ76tHgiURK4OP/kC3dDjAzfv2AQzKAncqPTIHiBHj21wcHaxVDZ60MB+drNcS0tSVBewB3C3pf1jeU16Tp+alR01Qlo8B3oZRjhkPC6si//+0XH16mUQqJESfKiAJSbxneLhPxu3O7lJZGzxRAzsh2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777412519; c=relaxed/simple; bh=OUaExO99m67jwthWvfzdD3J9fDxAj3XMLv+OhaFhrsQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=W6hek1oaV06AUo8SmarvEz3oekIX7knzr9H4QsxAFDeJRJ+yk7F5IjtTl9t2S3WEWGtKk3RGPrWThtutPh75EfxZnJYguCqa+xtLxQL2cTKR041xkrLXpHJh9VxIPIc4JWoJA7tav9U8EYudhMv+veN/QeU/aW0eH6IatDVJ9Lc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IEIwLWGp; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IEIwLWGp" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2b2429f98d0so71037105ad.2 for ; Tue, 28 Apr 2026 14:41:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777412517; x=1778017317; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0ivxoL7rxhcs0BB8mAqLqAJ5JywAgHHDv45sMwUwMt0=; b=IEIwLWGp4gs/tA1gIhypzuDfYUFmA38ajhlIIypiGO4YHdAe1k1vvihmOtGcdHLYXv S7inREGzQ8x88eHck7a7rwA4dSf5X+6yXcbwONhUX2IXqI2Ok03SxAzYuQ5wvAuiGH3h iTVaaivssLiWIrQsmbMOuzI/SThybYGaMf+lbvghIiG27rikeU0dp8pXBtsNDzArwQvq 4ayZEcfNAgmyIKSIH1ZOhQu/kt2mnOmmEWkZ3zSAy/p++uaym1AJ7LFNb5tgh7esO/M+ fRlLEiedxNv7XS4/zB226J7tadyBlTS1Q5M0NpJSzfeg9l90KnL4NELDOQKEkv2xNBRg kpEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777412517; x=1778017317; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0ivxoL7rxhcs0BB8mAqLqAJ5JywAgHHDv45sMwUwMt0=; b=PPaAr39oCzUJqsH3iKgzh00Q1c9uvz6TpIgEGwX9Q2uoDHc25Fs0R1BCwT7uzyZfrK YkmE9fBhnSQWTemQOduMsSqKtUQwhvwdKcXIxA8h+20oOznr9FzIudrJ9lKvloEh32+T ntaJK9A8E/HylOLYIZIQSbNHZmz+Dc7tC4hhxqHEh83ulcT9IadJZZb0cqdYvLPyWBu1 E/Ei/qrbG8Q6Ws/Ta5ywYMFR3thwotLN39KWyrEt9CjnYkX3zJR8D9syAivOBUsLVOD0 MM5hucJmbxNzQ9X+KmOHW79Y7yIqQGGcbkybVePrsHvSCEd6+/LDpUQH/p31zqEggEE4 KdPA== X-Forwarded-Encrypted: i=1; AFNElJ+w3Xz2Tl3h2jvUPArYNoaYSMml/elySSgdfanU3Qpll5fmaF8eS42oU6cG/VfDAzXHFYfXGzjQayep6t4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2OSeK+o1jarE+XvkqRNN0wFxRCUuG9wne/BUR2dAZ3O7YARgM 1HJl1yMJyfqggFljpflUYUUze/CNfObaUZA+SHS90cwz72XAxFl5SkNc X-Gm-Gg: AeBDieur9D469eh39eW6x+fJgJfrS1Y4Ydlg1VtApnjd/3nwVU3aItOOC0/h2vrKQUj gRL+fr+B4KYcvji/vkfnfAyUBIw1F9IuAK4GYqPtWbRfYcfblVt0NFmnF63NcB8rO29mLrtp01O R83Wr4rHrXCopGqbY31EigjWLgw0QRbqvggpbWc8kXfJ3J//qD3VBn1+p/j7tNfE47IGPp7BO8n o2SBACN4wsmInAzLBPYD8amxc5fAQzAFJ9FcFqkrUE6dlGPmyW07xuPy1q6rUf4GLtk/zpqChdv awc+oK0+OtRu4LJ6OjytL4FBLjO7YEeOp0VB0BFM+H5mJYXaYMqb8b6CHh7/peTpg+LRRb9mPut 7AWfrjKe7PSsp7X9ibLDrmzPFO8wX90lbna4M5hbgQijirxc0Z6DwGlCc9v0g74s7xjBt7I23Yw krdq9TOn7SlOxhkSgfoceznPE9R+kmI5teSlqrBi9eXgo6TOjvL2ySb9aeOOAVBTvlFeaIpsmSX EE= X-Received: by 2002:a17:902:e746:b0:2b4:5fae:cbd8 with SMTP id d9443c01a7336-2b97c4e41a6mr54324675ad.37.1777412517332; Tue, 28 Apr 2026 14:41:57 -0700 (PDT) Received: from pop-os.. ([2401:4900:647d:e40d:2ab9:6874:139a:41e5]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b988772e9csm1877055ad.9.2026.04.28.14.41.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 14:41:56 -0700 (PDT) From: Tushar Tibude To: mchehab@kernel.org, bp@alien8.de, tony.luck@intel.com, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Cc: qiuxu.zhuo@intel.com, Tushar Tibude Subject: [PATCH v2] EDAC: i7300: disable error reporting if init fails and refactor helper Date: Wed, 29 Apr 2026 03:11:16 +0530 Message-ID: <20260428214116.19230-1-tushar.tibude1000@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If error reporting is enabled during initialization but initialization fails immediately after, or during normal driver exit, error reporting is left enabled in the mask register even after exit. Replace i7300_enable_error_reporting() with i7300_set_error_reporting() to combine enabling/disabling. Disable reporting at initialization failure and driver exit, before call to i7300_put_devices() for cleanup. This ensures clean hardware handling by disabling any unused error reporting bits before exiting. Signed-off-by: Tushar Tibude --- v2: - Replace disable function with i7300_set_error_reporting - Disable reporting at normal driver exit - Move enabled_error_reporting flag initialization drivers/edac/i7300_edac.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index 69068f8d0..f729bf0e2 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c @@ -550,11 +550,12 @@ static void i7300_clear_error(struct mem_ctl_info *mc= i) } =20 /** - * i7300_enable_error_reporting() - Enable the memory reporting logic at t= he + * i7300_set_error_reporting() - Enable or disable the memory reporting lo= gic at the * hardware * @mci: struct mem_ctl_info pointer + * @enable: enables if 'true', disables if 'false' */ -static void i7300_enable_error_reporting(struct mem_ctl_info *mci) +static void i7300_set_error_reporting(struct mem_ctl_info *mci, bool enabl= e) { struct i7300_pvt *pvt =3D mci->pvt_info; u32 fbd_error_mask; @@ -563,8 +564,11 @@ static void i7300_enable_error_reporting(struct mem_ct= l_info *mci) pci_read_config_dword(pvt->pci_dev_16_1_fsb_addr_map, EMASK_FBD, &fbd_error_mask); =20 - /* Enable with a '0' */ - fbd_error_mask &=3D ~(EMASK_FBD_ERR_MASK); + /* Enable with 0, disable with 1 */ + if (enable) + fbd_error_mask &=3D ~(EMASK_FBD_ERR_MASK); + else + fbd_error_mask |=3D EMASK_FBD_ERR_MASK; =20 pci_write_config_dword(pvt->pci_dev_16_1_fsb_addr_map, EMASK_FBD, fbd_error_mask); @@ -1025,6 +1029,7 @@ static int i7300_init_one(struct pci_dev *pdev, const= struct pci_device_id *id) struct edac_mc_layer layers[3]; struct i7300_pvt *pvt; int rc; + bool enabled_error_reporting; =20 /* wake up device */ rc =3D pci_enable_device(pdev); @@ -1087,17 +1092,19 @@ static int i7300_init_one(struct pci_dev *pdev, con= st struct pci_device_id *id) if (i7300_get_mc_regs(mci)) { edac_dbg(0, "MC: Setting mci->edac_cap to EDAC_FLAG_NONE because i7300_i= nit_csrows() returned nonzero value\n"); mci->edac_cap =3D EDAC_FLAG_NONE; /* no csrows found */ + enabled_error_reporting =3D false; } else { edac_dbg(1, "MC: Enable error reporting now\n"); - i7300_enable_error_reporting(mci); + i7300_set_error_reporting(mci, true); + enabled_error_reporting =3D true; } =20 /* add this new MC control structure to EDAC's list of MCs */ if (edac_mc_add_mc(mci)) { edac_dbg(0, "MC: failed edac_mc_add_mc()\n"); - /* FIXME: perhaps some code should go here that disables error - * reporting if we just enabled it - */ + /* Disable error reporting if we just enabled it */ + if (enabled_error_reporting) + i7300_set_error_reporting(mci, false); goto fail1; } =20 @@ -1147,6 +1154,8 @@ static void i7300_remove_one(struct pci_dev *pdev) =20 tmp =3D ((struct i7300_pvt *)mci->pvt_info)->tmp_prt_buffer; =20 + /* Disable error reporting before unregistering device */ + i7300_set_error_reporting(mci, false); /* retrieve references to resources, and free those resources */ i7300_put_devices(mci); =20 --=20 2.43.0