From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 366F61C32EB; Tue, 8 Oct 2024 13:10:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728393002; cv=none; b=bhMk6Wgyo8JsjxP7ABSsuv5bhGzKJQgcuhU02E/n9pHHE3Q7CNmAKp6+99AEfvAM7J9z0oJAt3EB5GBY/eEvxc7hZy8SU7lCi0JFHeO/owHNlMRPwO1qZ3+IUe7Fzm7Dxc1qLviLLzZ/ypsrYbEHqrHXUZNAO72t6uhUNIjl/V4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728393002; c=relaxed/simple; bh=vGlZW+PWoDvFTp4SQc6arnMNlDd2AW9YbWHNsL/7azs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qR1yMDIb006EAm62OSWGKZoQl8ma7tTuBzBxqhIjGH3JoYPJCsIBSWVsMCRht7KHjyPLteQU2zKFu6EZ/qIH9/amjHLPkRLsEm74lbsP3nJSJCytBIt6XgJ5lHsq/exoFDhHYZ9lW6c02MKBYsJOGU7K9Hx9TFOduDhkon0vxKs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nWYAdy47; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nWYAdy47" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA001C4CEC7; Tue, 8 Oct 2024 13:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728393002; bh=vGlZW+PWoDvFTp4SQc6arnMNlDd2AW9YbWHNsL/7azs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nWYAdy47Fw1L0e3yujvRWOPc+F2+4GEtKxqn/RcBS3Wtfulh6EBZBSHd5HCd2cl35 23qSvphZF7k6a2L4SDmrwoUQnbX/NInLkQgZXvrCP4czAvv2uaLr7fCpCmoFgbuZaM VR+JwWEV7I1FHZoqA6KOe5YlnJMDUpTbTDBwc7NA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , John Garry , Daniel Wagner , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.6 006/386] scsi: pm8001: Do not overwrite PCI queue mapping Date: Tue, 8 Oct 2024 14:04:11 +0200 Message-ID: <20241008115629.568808372@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115629.309157387@linuxfoundation.org> References: <20241008115629.309157387@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Wagner [ Upstream commit a141c17a543332fc1238eb5cba562bfc66879126 ] blk_mq_pci_map_queues() maps all queues but right after this, we overwrite these mappings by calling blk_mq_map_queues(). Just use one helper but not both. Fixes: 42f22fe36d51 ("scsi: pm8001: Expose hardware queues for pm80xx") Reviewed-by: Christoph Hellwig Reviewed-by: John Garry Signed-off-by: Daniel Wagner Link: https://lore.kernel.org/r/20240912-do-not-overwrite-pci-mapping-v1-1-85724b6cec49@suse.de Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/pm8001/pm8001_init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 443a3176c6c0c..c2f6151cbd2d0 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -88,10 +88,12 @@ static void pm8001_map_queues(struct Scsi_Host *shost) struct pm8001_hba_info *pm8001_ha = sha->lldd_ha; struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT]; - if (pm8001_ha->number_of_intr > 1) + if (pm8001_ha->number_of_intr > 1) { blk_mq_pci_map_queues(qmap, pm8001_ha->pdev, 1); + return; + } - return blk_mq_map_queues(qmap); + blk_mq_map_queues(qmap); } /* -- 2.43.0