From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1578C32757 for ; Wed, 14 Aug 2019 17:07:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F04E208C2 for ; Wed, 14 Aug 2019 17:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802479; bh=VBjxKQbmEC3ejwzUV+O9gdG/YAAWgAXWkxhLYsFppDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kELDerWlJSy10fAJGeg8m+60aE+5JhGO3uAWrp5DyytSfDc8XVmM3iid50LaXIQtt gYRBYIOt//U0q/Y15PnjeIGBRgzXJRHh/yVWo8LxmuRf/mYDUHC3NKt5QtNm3RUkuC rdLh2nloR7NWD9rW1KoL4JxqI7psW8TO/i9Li/pg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730019AbfHNRH7 (ORCPT ); Wed, 14 Aug 2019 13:07:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:57674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729993AbfHNRHz (ORCPT ); Wed, 14 Aug 2019 13:07:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C12C521883; Wed, 14 Aug 2019 17:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802475; bh=VBjxKQbmEC3ejwzUV+O9gdG/YAAWgAXWkxhLYsFppDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x7351Hfp8YBJXo2t7YgNqg1C7wrX8tvox/3YeGSIiCfdV2he2caZvzpoD2/ykO/3f /PaVLHfaS97qO+FBVKTqAWkhBftYr931bfduSlX8Oilppyv9UYveejvKhbaT4GY/7N n20L5JJLu2Uh7mmG6Pl0B0/rq4WTrND3uCjjnQcc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Emmanuel Grumbach , Johannes Berg Subject: [PATCH 5.2 140/144] iwlwifi: dont unmap as page memory that was mapped as single Date: Wed, 14 Aug 2019 19:01:36 +0200 Message-Id: <20190814165805.822748207@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165759.466811854@linuxfoundation.org> References: <20190814165759.466811854@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Emmanuel Grumbach commit 87e7e25aee6b59fef740856f4e86d4b60496c9e1 upstream. In order to remember how to unmap a memory (as single or as page), we maintain a bit per Transmit Buffer (TBs) in the meta data (structure iwl_cmd_meta). We maintain a bitmap: 1 bit per TB. If the TB is set, we will free the memory as a page. This bitmap was never cleared. Fix this. Cc: stable@vger.kernel.org Fixes: 3cd1980b0cdf ("iwlwifi: pcie: introduce new tfd and tb formats") Signed-off-by: Emmanuel Grumbach Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c @@ -435,6 +435,8 @@ static void iwl_pcie_tfd_unmap(struct iw DMA_TO_DEVICE); } + meta->tbs = 0; + if (trans->cfg->use_tfh) { struct iwl_tfh_tfd *tfd_fh = (void *)tfd;