From patchwork Fri Jun 30 05:46:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 106670 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1904829qge; Thu, 29 Jun 2017 22:47:30 -0700 (PDT) X-Received: by 10.84.224.11 with SMTP id r11mr22741228plj.267.1498801650491; Thu, 29 Jun 2017 22:47:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498801650; cv=none; d=google.com; s=arc-20160816; b=BRma6R+8t2N6FFHTOv2dwCXd1gE8fLMHMMAwwwvadoLUW5ln4AyDphQNypitQ213dq i3fZRjXFBNVrCPRH5zy4EjV7ynMmISEZzAMdKzv7girdh42XGvH28M0tVJ7Si8fTTFZ9 PXhX8cf3bwY15Z9BGFDA7wQeSFX96MveuBkA17hct3l778SnYv9JHdZlp5+eqQ/0wKn4 4slFJaj2ddC0QCCDjY5MZ97zNLs3mx9X3cu83x9ZBu+jG83siOrAq8FVHCmnDOZwsc+v aYQuZBGKqR0iQjm3u/st76mlL9o8pCl1CTIkRMT+Lv055BJnMzVhXLuUUVma4u3yQPM/ w69Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=aMenFKOAKyew1mPxTjmyWJhwoCdAERrBySI0YLSsh3g=; b=nIku9Q1AdqnifwcFDUSeD2VJ4pfuv4OFrsHq1i6iTrKaU2sDbUakkjNvtW5X6E2ifc N8e0XlLjNN+fQ75to0d5bEC7iYrnH0uzv80cgSM1526G3czlMlTbjseH4l5B3/P+olr5 Lgw9Q6luNPftB+0U4uLcARCXXqdpM/8C5KKwvIlvrC31uQ7UR1MqGq2SUJOBMMUa0xqw JZCV8onjCdasPTgxiqZYdoa+YOahpHDxZM8aGvuKqNW5tc0diAcyS3LweaskJ9UALZZi vtfnMY9adtAbpW+MRQgSlFrIx4e0/IFP8wimwVZ58k+0exQYLGlH9qORPiETvpsgL3q4 oFdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=V4oBLx0G; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m5si4519277pgj.463.2017.06.29.22.47.30; Thu, 29 Jun 2017 22:47:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=V4oBLx0G; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752076AbdF3FrY (ORCPT + 6 others); Fri, 30 Jun 2017 01:47:24 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:34046 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752071AbdF3FrX (ORCPT ); Fri, 30 Jun 2017 01:47:23 -0400 Received: by mail-pf0-f181.google.com with SMTP id s66so61549494pfs.1 for ; Thu, 29 Jun 2017 22:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aMenFKOAKyew1mPxTjmyWJhwoCdAERrBySI0YLSsh3g=; b=V4oBLx0GDi/9EW8P9MnFoHkYktDp+fuls6hiNNyxdFTN59agXInC2Sm0PnNjryvFnM lvRcFcdWQvT65VGm7oNA3jcXOs4meKlwwRyM5b80T+5nel+CxMXzntDP2nD9aILx/ENj CQci3Z5C9O8K2HjcXegO0kjcdVXV2KDdFox7I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aMenFKOAKyew1mPxTjmyWJhwoCdAERrBySI0YLSsh3g=; b=j9K9eWFApl/tBz698jwFF2Yt/0O9A+Zuh5USqTJfEBLHzK9xrl41jKL9jdOJL/xBf5 AV3D1DJ/x7ntt5y8eVU/wWN3VWYMPTyrreU50kpuFg3oyxzPfR614eC9BXM0sre+gMtX ETInwHff9+MtPRosv4rW8Y5srNQJu9VpkPXhoUajinyGtN3bAfsOng8P6YjXBLrTjx/c gAI1B34PpYOdx53vNP0TBsJu338YwZYk2X82mAmnGtLuq0WfrO0lCB/hN3caXzSuzk/C 4UaSBtslU3SfVh5+ASzQ1LgCih6awRre7Ucd4fCcqXuwy93xLZTfnhtphf1IlpAXYx0S qsdA== X-Gm-Message-State: AKS2vOy3V57ejtPgi7oDJV2wFMg6VR47EvNRQ7UIWNggyV3R4VOS7kVq 5cgvvps+FkcWdewK X-Received: by 10.98.144.132 with SMTP id q4mr20066225pfk.8.1498801637541; Thu, 29 Jun 2017 22:47:17 -0700 (PDT) Received: from localhost.localdomain ([106.51.129.233]) by smtp.gmail.com with ESMTPSA id a187sm11405550pgc.37.2017.06.29.22.47.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jun 2017 22:47:16 -0700 (PDT) From: Amit Pundir To: Greg KH Cc: Stable , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Brian Norris Subject: [PATCH for-4.4 10/16] mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only Date: Fri, 30 Jun 2017 11:16:34 +0530 Message-Id: <1498801600-20896-11-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498801600-20896-1-git-send-email-amit.pundir@linaro.org> References: <1498801600-20896-1-git-send-email-amit.pundir@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rafał Miłecki commit 2a36a5c30eab9cd1c9d2d08bd27cd763325d70c5 upstream. We allowed using bcm47xxpart on BCM5301X arch with commit: 9e3afa5f5c7 ("mtd: bcm47xxpart: allow enabling on ARCH_BCM_5301X") BCM5301X devices may contain some partitions in higher memory, e.g. Netgear R8000 has board_data at 0x2600000. To detect them we should use size limit on MIPS only. Signed-off-by: Rafał Miłecki Signed-off-by: Brian Norris Signed-off-by: Amit Pundir --- To be cherry-picked on linux-3.18.y as well. drivers/mtd/bcm47xxpart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c index 5abab8800891..546170a77466 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c @@ -118,8 +118,8 @@ static int bcm47xxpart_parse(struct mtd_info *master, /* Parse block by block looking for magics */ for (offset = 0; offset <= master->size - blocksize; offset += blocksize) { - /* Nothing more in higher memory */ - if (offset >= 0x2000000) + /* Nothing more in higher memory on BCM47XX (MIPS) */ + if (config_enabled(CONFIG_BCM47XX) && offset >= 0x2000000) break; if (curr_part >= BCM47XXPART_MAX_PARTS) {