Received: by 2002:a05:6a10:2785:0:0:0:0 with SMTP id ia5csp3040655pxb; Tue, 12 Jan 2021 05:03:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4djxov9pY+kYTw0B4L17XQ906Lk1DAdIElkxLdUL9xyrkH2U32VpFWQCAcgX0ON/eizVi X-Received: by 2002:a17:907:2131:: with SMTP id qo17mr3101033ejb.546.1610456609792; Tue, 12 Jan 2021 05:03:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610456609; cv=none; d=google.com; s=arc-20160816; b=0Dpu/QYVzUQQODmgFaU2Qabv3gZV/offmEML/IW1KKOop/mKlRXNamoigB1YxIGC3e cAzrHhghLY66rft9caOP1KSUzIP82USJKXdhOAJHf/0wsaw/J3WLJ0O2RJFbfeEWPGUn LVPIAzGFEtHWEIugoU+An4hm8B8BxiCtFOiPykyB9GMCjyQFMolM1yDhxXwLtXMCrC6R Rpz4Rwjl5aJdk9FjMiqypUs8nbSiglb8uWSElh6/7rR4VfXFgCDXJTSKP+PvKOmV6/Dm dzD5e8xKmDdri38hjJwuXIWdPjVV7TiZCci8UoYf6mJ8JOJ2JncBIXaDUG6UUi+Rh4ub NjcA== 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:dkim-signature :dkim-signature:from; bh=RCzPm5DxqpDl9GsT8qnDQdC9zPB3mt7eorYvVVflJMg=; b=GtEjunL/VDCOu7VaeP5vDG2fDR3r8CWwEAHyDHZQCL+qo26XnEIeozfddyHHxRFxg2 MxM+7eLbGdBYEBYMXhHwuLcgPAFJqiGnAQ8EujimGgUmj5lEy1DUiZ9ziZTcwYqI4APW 6w+pgctrMann6Ly/Z4nGEAoYxR7qYGdhmKC6sfWNfGxbK/TY5P71p35RCRQr9Ths5hN3 UvaVwKgBSd+w3MuV9xngIRlwy8Qne+U+WF9mhj2Skx7T8+qcnsBWDaMkxNFCm7hbtk8F N7dNqO3azr8Dv/XYedcmLzNVtTQuztiuFYpF2l+xbIoD1G9YnDun+xx3UCQrdPWMrON4 U+vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=m01ORvzz; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Y5Ierh9+; 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=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q19si1065392ejx.617.2021.01.12.05.03.05; Tue, 12 Jan 2021 05:03:29 -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=@linutronix.de header.s=2020 header.b=m01ORvzz; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Y5Ierh9+; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732331AbhALLIm (ORCPT + 99 others); Tue, 12 Jan 2021 06:08:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731569AbhALLIe (ORCPT ); Tue, 12 Jan 2021 06:08:34 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACC87C061794; Tue, 12 Jan 2021 03:07:53 -0800 (PST) From: "Ahmed S. Darwish" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1610449672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RCzPm5DxqpDl9GsT8qnDQdC9zPB3mt7eorYvVVflJMg=; b=m01ORvzzlU/FZX+1Ug1ef3VZKyiTywyW/6yqJLntHCyGbDPgaJd/hwYXHRvph7k1ze8y1K v4FBZqRxBoyNl6UOxHL1zVRD9OiVqFH+OVgNFAD7Fm2u/D86cFKjrdIDtgMhvbn8gI/J0L /xGngR8NOcXCLxb88Qy4M8JgFzBONY3Mlvt6mVnyMt4+MByO4Cs5SWdOFPdbYrA6wpcmT5 1FndBPgFFbEHAkSqK5Ubp9/rR7sAdnnMDAad4JbH/QWTYZlsUWezv9VA1ypnObFFveF27F anRLxgZPVmP5XNPFzQI5ciHCtRRnAGeqnuXttPfiLw/XdzOLeQ6Vl31wllgzVg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1610449672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RCzPm5DxqpDl9GsT8qnDQdC9zPB3mt7eorYvVVflJMg=; b=Y5Ierh9+MyL7cCYACzp+y9l+0P5iLz8hYK4VoEPrieKCSe9lpxm930WmkCsDS17ahR1x/F lSowVVpPdyM9OiDw== To: "James E.J. Bottomley" , "Martin K. Petersen" , John Garry , Jason Yan , Daniel Wagner , Artur Paszkiewicz , Jack Wang Cc: linux-scsi@vger.kernel.org, intel-linux-scu@intel.com, LKML , Thomas Gleixner , "Sebastian A. Siewior" , "Ahmed S. Darwish" Subject: [PATCH v2 13/19] scsi: hisi_sas: Switch back to original libsas event notifiers Date: Tue, 12 Jan 2021 12:06:41 +0100 Message-Id: <20210112110647.627783-14-a.darwish@linutronix.de> In-Reply-To: <20210112110647.627783-1-a.darwish@linutronix.de> References: <20210112110647.627783-1-a.darwish@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org libsas event notifiers required an extension where gfp_t flags must be explicitly passed. For bisectability, a temporary _gfp() variant of such functions were added. All call sites then got converted use the _gfp() variants and explicitly pass GFP context. Having no callers left, the original libsas notifiers were then modified to accept gfp_t flags by default. Switch back to the original libas API, while still passing GFP context. The libsas _gfp() variants will be removed afterwards. Signed-off-by: Ahmed S. Darwish Cc: John Garry --- drivers/scsi/hisi_sas/hisi_sas_main.c | 8 ++++---- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index f781b52c6441..625327e99b06 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -627,7 +627,7 @@ static void hisi_sas_bytes_dmaed(struct hisi_hba *hisi_hba, int phy_no, return; } - sas_notify_phy_event_gfp(sas_phy, PHYE_OOB_DONE, gfp_flags); + sas_notify_phy_event(sas_phy, PHYE_OOB_DONE, gfp_flags); if (sas_phy->phy) { struct sas_phy *sphy = sas_phy->phy; @@ -655,7 +655,7 @@ static void hisi_sas_bytes_dmaed(struct hisi_hba *hisi_hba, int phy_no, } sas_phy->frame_rcvd_size = phy->frame_rcvd_size; - sas_notify_port_event_gfp(sas_phy, PORTE_BYTES_DMAED, gfp_flags); + sas_notify_port_event(sas_phy, PORTE_BYTES_DMAED, gfp_flags); } static struct hisi_sas_device *hisi_sas_alloc_dev(struct domain_device *device) @@ -1430,7 +1430,7 @@ static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state) _sas_port = sas_port; if (dev_is_expander(dev->dev_type)) - sas_notify_port_event_gfp(sas_phy, + sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD, GFP_KERNEL); } @@ -2209,7 +2209,7 @@ void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy, return; } /* Phy down and not ready */ - sas_notify_phy_event_gfp(sas_phy, PHYE_LOSS_OF_SIGNAL, gfp_flags); + sas_notify_phy_event(sas_phy, PHYE_LOSS_OF_SIGNAL, gfp_flags); sas_phy_disconnected(sas_phy); if (port) { diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c index b0a72ffce4f0..c33f2881d3c4 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c @@ -1423,7 +1423,7 @@ static irqreturn_t int_bcast_v1_hw(int irq, void *p) } if (!test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags)) - sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD, GFP_ATOMIC); + sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD, GFP_ATOMIC); end: hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT2, diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c index d8f8fb2ed63b..a9de1939c426 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c @@ -2825,7 +2825,7 @@ static void phy_bcast_v2_hw(int phy_no, struct hisi_hba *hisi_hba) bcast_status = hisi_sas_phy_read32(hisi_hba, phy_no, RX_PRIMS_STATUS); if ((bcast_status & RX_BCAST_CHG_MSK) && !test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags)) - sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD, GFP_ATOMIC); + sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD, GFP_ATOMIC); hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0, CHL_INT0_SL_RX_BCST_ACK_MSK); hisi_sas_phy_write32(hisi_hba, phy_no, SL_RX_BCAST_CHK_MSK, 0); diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index 87392de60e9d..9ffc429c8d42 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -1607,7 +1607,7 @@ static irqreturn_t phy_bcast_v3_hw(int phy_no, struct hisi_hba *hisi_hba) bcast_status = hisi_sas_phy_read32(hisi_hba, phy_no, RX_PRIMS_STATUS); if ((bcast_status & RX_BCAST_CHG_MSK) && !test_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags)) - sas_notify_port_event_gfp(sas_phy, PORTE_BROADCAST_RCVD, GFP_ATOMIC); + sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD, GFP_ATOMIC); hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0, CHL_INT0_SL_RX_BCST_ACK_MSK); hisi_sas_phy_write32(hisi_hba, phy_no, SL_RX_BCAST_CHK_MSK, 0); -- 2.30.0