From patchwork Wed Mar 30 15:42:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajkumar Manoharan X-Patchwork-Id: 8698911 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C1F3B9F44D for ; Wed, 30 Mar 2016 15:43:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA6D620357 for ; Wed, 30 Mar 2016 15:43:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E19C620376 for ; Wed, 30 Mar 2016 15:43:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754212AbcC3Pmw (ORCPT ); Wed, 30 Mar 2016 11:42:52 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:22373 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754058AbcC3Pmu (ORCPT ); Wed, 30 Mar 2016 11:42:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1459352570; x=1490888570; h=from:to:cc:subject:date:message-id:mime-version; bh=0vkeDNdxzDX5C/XH1CARZ7BLCUQwlbYH34xbuYKcfRM=; b=Htf7p/CCsl+0VYrqltNzxRGgtE8wzVKLk432vZt8W0OqzGCRQJJP2K1J W2yfxHPGuGZd1ImnDWeG+DbfhaQLEVBkMBz39vEDmefCypqp9ZQI5+FcY ylHwq1Jzn/dOlC5ywzxog0zRSDDuJejNMyTCZd4DnC+eCyL+oGw0XUp8R A=; X-IronPort-AV: E=Sophos;i="5.24,416,1455004800"; d="scan'208";a="275790351" Received: from ironmsg02-r-new.qualcomm.com (HELO ironmsg02-R.qualcomm.com) ([10.53.140.106]) by wolverine02.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 30 Mar 2016 08:42:49 -0700 X-IronPort-AV: E=McAfee;i="5700,7163,8119"; a="699543383" Received: from nasanexm01e.na.qualcomm.com ([10.85.0.31]) by ironmsg02-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 30 Mar 2016 08:42:49 -0700 Received: from APHYDEXM01E.ap.qualcomm.com (10.252.127.13) by NASANEXM01E.na.qualcomm.com (10.85.0.31) with Microsoft SMTP Server (TLS) id 15.0.1130.7; Wed, 30 Mar 2016 08:42:47 -0700 Received: from qcmail1.qualcomm.com (10.80.80.8) by APHYDEXM01E.ap.qualcomm.com (10.252.127.13) with Microsoft SMTP Server (TLS) id 15.0.1130.7; Wed, 30 Mar 2016 21:12:39 +0530 Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation); Wed, 30 Mar 2016 21:12:34 +0530 From: Rajkumar Manoharan To: CC: , , "Rajkumar Manoharan" Subject: [PATCH 1/3] ath10k: fix calibration init sequence of qca99x0 Date: Wed, 30 Mar 2016 21:12:29 +0530 Message-ID: <1459352551-11773-1-git-send-email-rmanohar@qti.qualcomm.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01B.na.qualcomm.com (10.85.0.82) To APHYDEXM01E.ap.qualcomm.com (10.252.127.13) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pre-calibration is meant for qca4019 which contains only caldata whereas calibration file is used by ar9888 and qca99x0 that contains both board data and caldata. So by definition both pre-cal-file and cal-file can not coexist. Keeping them in shared memory (union), is breaking boot sequence of qca99x0. Fix it by storing both binaries in separate memories. This issue is reported in ipq8064 platform which includes caldata in flash memory. Reported-by: Sebastian Gottschall Signed-off-by: Rajkumar Manoharan --- drivers/net/wireless/ath/ath10k/core.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index b6c157e..a7d04bc 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -725,10 +725,8 @@ struct ath10k { const void *firmware_data; size_t firmware_len; - union { - const struct firmware *pre_cal_file; - const struct firmware *cal_file; - }; + const struct firmware *pre_cal_file; + const struct firmware *cal_file; struct { const void *firmware_codeswap_data;