Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 17 Jul 2024 14:21:38 GMT
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 6bc34cdd9671 - stable/14 - cxgbe(4): Retire t4_intr_clear.
Message-ID:  <202407171421.46HELc44026860@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch stable/14 has been updated by np:

URL: https://cgit.FreeBSD.org/src/commit/?id=6bc34cdd9671bfd3ccfc02d91b8e118482e6e2d3

commit 6bc34cdd9671bfd3ccfc02d91b8e118482e6e2d3
Author:     Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2024-04-26 00:39:55 +0000
Commit:     Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2024-07-17 06:35:55 +0000

    cxgbe(4): Retire t4_intr_clear.
    
    The firmware clears the interrupts already and it has a better idea of
    exactly what to clear for which generation of the ASIC.  There is no
    need for the driver to get involved.
    
    Sponsored by:   Chelsio Communications
    
    (cherry picked from commit 1c7f9c8b4673abf3723be09afed4443261e0d186)
---
 sys/dev/cxgbe/common/common.h |  1 -
 sys/dev/cxgbe/common/t4_hw.c  | 93 -------------------------------------------
 sys/dev/cxgbe/t4_main.c       |  2 -
 3 files changed, 96 deletions(-)

diff --git a/sys/dev/cxgbe/common/common.h b/sys/dev/cxgbe/common/common.h
index 3d546c2f976f..f43ffc83dff1 100644
--- a/sys/dev/cxgbe/common/common.h
+++ b/sys/dev/cxgbe/common/common.h
@@ -618,7 +618,6 @@ struct fw_filter_wr;
 
 void t4_intr_enable(struct adapter *adapter);
 void t4_intr_disable(struct adapter *adapter);
-void t4_intr_clear(struct adapter *adapter);
 bool t4_slow_intr_handler(struct adapter *adapter, bool verbose);
 
 int t4_hash_mac_addr(const u8 *addr);
diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c
index cf4f5a65c3e5..b58d9f5df0d9 100644
--- a/sys/dev/cxgbe/common/t4_hw.c
+++ b/sys/dev/cxgbe/common/t4_hw.c
@@ -5454,99 +5454,6 @@ void t4_intr_disable(struct adapter *adap)
 	t4_set_reg_field(adap, A_PL_INT_MAP0, 1 << adap->pf, 0);
 }
 
-/**
- *	t4_intr_clear - clear all interrupts
- *	@adap: the adapter whose interrupts should be cleared
- *
- *	Clears all interrupts.  The caller must be a PCI function managing
- *	global interrupts.
- */
-void t4_intr_clear(struct adapter *adap)
-{
-	static const u32 cause_reg[] = {
-		A_CIM_HOST_INT_CAUSE,
-		A_CIM_HOST_UPACC_INT_CAUSE,
-		MYPF_REG(A_CIM_PF_HOST_INT_CAUSE),
-		A_CPL_INTR_CAUSE,
-		EDC_REG(A_EDC_INT_CAUSE, 0), EDC_REG(A_EDC_INT_CAUSE, 1),
-		A_LE_DB_INT_CAUSE,
-		A_MA_INT_WRAP_STATUS,
-		A_MA_PARITY_ERROR_STATUS1,
-		A_MA_INT_CAUSE,
-		A_MPS_CLS_INT_CAUSE,
-		A_MPS_RX_PERR_INT_CAUSE,
-		A_MPS_STAT_PERR_INT_CAUSE_RX_FIFO,
-		A_MPS_STAT_PERR_INT_CAUSE_SRAM,
-		A_MPS_TRC_INT_CAUSE,
-		A_MPS_TX_INT_CAUSE,
-		A_MPS_STAT_PERR_INT_CAUSE_TX_FIFO,
-		A_NCSI_INT_CAUSE,
-		A_PCIE_INT_CAUSE,
-		A_PCIE_NONFAT_ERR,
-		A_PL_PL_INT_CAUSE,
-		A_PM_RX_INT_CAUSE,
-		A_PM_TX_INT_CAUSE,
-		A_SGE_INT_CAUSE1,
-		A_SGE_INT_CAUSE2,
-		A_SGE_INT_CAUSE3,
-		A_SGE_INT_CAUSE4,
-		A_SMB_INT_CAUSE,
-		A_TP_INT_CAUSE,
-		A_ULP_RX_INT_CAUSE,
-		A_ULP_RX_INT_CAUSE_2,
-		A_ULP_TX_INT_CAUSE,
-		A_ULP_TX_INT_CAUSE_2,
-
-		MYPF_REG(A_PL_PF_INT_CAUSE),
-	};
-	int i;
-	const int nchan = adap->chip_params->nchan;
-
-	for (i = 0; i < ARRAY_SIZE(cause_reg); i++)
-		t4_write_reg(adap, cause_reg[i], 0xffffffff);
-
-	if (is_t4(adap)) {
-		t4_write_reg(adap, A_PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
-		    0xffffffff);
-		t4_write_reg(adap, A_PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
-		    0xffffffff);
-		t4_write_reg(adap, A_MC_INT_CAUSE, 0xffffffff);
-		for (i = 0; i < nchan; i++) {
-			t4_write_reg(adap, PORT_REG(i, A_XGMAC_PORT_INT_CAUSE),
-			    0xffffffff);
-		}
-	}
-	if (chip_id(adap) >= CHELSIO_T5) {
-		t4_write_reg(adap, A_MA_PARITY_ERROR_STATUS2, 0xffffffff);
-		t4_write_reg(adap, A_MPS_STAT_PERR_INT_CAUSE_SRAM1, 0xffffffff);
-		t4_write_reg(adap, A_SGE_INT_CAUSE5, 0xffffffff);
-		t4_write_reg(adap, A_MC_P_INT_CAUSE, 0xffffffff);
-		if (is_t5(adap)) {
-			t4_write_reg(adap, MC_REG(A_MC_P_INT_CAUSE, 1),
-			    0xffffffff);
-		}
-		for (i = 0; i < nchan; i++) {
-			t4_write_reg(adap, T5_PORT_REG(i,
-			    A_MAC_PORT_PERR_INT_CAUSE), 0xffffffff);
-			if (chip_id(adap) > CHELSIO_T5) {
-				t4_write_reg(adap, T5_PORT_REG(i,
-				    A_MAC_PORT_PERR_INT_CAUSE_100G),
-				    0xffffffff);
-			}
-			t4_write_reg(adap, T5_PORT_REG(i, A_MAC_PORT_INT_CAUSE),
-			    0xffffffff);
-		}
-	}
-	if (chip_id(adap) >= CHELSIO_T6) {
-		t4_write_reg(adap, A_SGE_INT_CAUSE6, 0xffffffff);
-	}
-
-	t4_write_reg(adap, A_MPS_INT_CAUSE, is_t4(adap) ? 0 : 0xffffffff);
-	t4_write_reg(adap, A_PL_PERR_CAUSE, 0xffffffff);
-	t4_write_reg(adap, A_PL_INT_CAUSE, 0xffffffff);
-	(void) t4_read_reg(adap, A_PL_INT_CAUSE);          /* flush */
-}
-
 /**
  *	hash_mac_addr - return the hash value of a MAC address
  *	@addr: the 48-bit Ethernet MAC address
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index d56a42eee8f4..04e4427732ac 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -1338,7 +1338,6 @@ t4_attach(device_t dev)
 		rc = partition_resources(sc);
 		if (rc != 0)
 			goto done; /* error message displayed already */
-		t4_intr_clear(sc);
 	}
 
 	rc = get_params__post_init(sc);
@@ -2298,7 +2297,6 @@ t4_resume(device_t dev)
 		rc = partition_resources(sc);
 		if (rc != 0)
 			goto done; /* error message displayed already */
-		t4_intr_clear(sc);
 	}
 
 	rc = get_params__post_init(sc);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407171421.46HELc44026860>