From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
Subject: Re: [PATCH 03/15] MIPS: OCTEON: Move CAVIUM_OCTEON_CVMSEG_SIZE to
 CPU_CAVIUM_OCTEON
Date: Wed, 21 May 2014 08:22:10 +0200
Message-ID: <20140521062210.GA11800@alberich>
References: <1400597236-11352-1-git-send-email-andreas.herrmann@caviumnetworks.com>
 <1400597236-11352-4-git-send-email-andreas.herrmann@caviumnetworks.com>
 <3124276.AVUgu1xWyv@radagast>
 <537BE3D7.1070904@caviumnetworks.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Cc: James Hogan <james.hogan@imgtec.com>, <linux-mips@linux-mips.org>,
	David Daney <ddaney.cavm@gmail.com>,
	Ralf Baechle <ralf@linux-mips.org>, <kvm@vger.kernel.org>,
	David Daney <david.daney@cavium.com>
To: David Daney <ddaney@caviumnetworks.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mail-bl2lp0206.outbound.protection.outlook.com ([207.46.163.206]:36236
	"EHLO na01-bl2-obe.outbound.protection.outlook.com"
	rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
	id S1751749AbaEUGXy (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 21 May 2014 02:23:54 -0400
Content-Disposition: inline
In-Reply-To: <537BE3D7.1070904@caviumnetworks.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Tue, May 20, 2014 at 04:23:03PM -0700, David Daney wrote:
> On 05/20/2014 03:52 PM, James Hogan wrote:
> >Hi Andreas,
> >
> >On Tuesday 20 May 2014 16:47:04 Andreas Herrmann wrote:
> >>From: David Daney <david.daney@cavium.com>
> >>
> >>CVMSEG is related to the CPU core not the SoC system.  So needs to be
> >>configurable there.
> >>
> >>Signed-off-by: David Daney <david.daney@cavium.com>
> >>Signed-off-by: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
> >>---
> >>  arch/mips/cavium-octeon/Kconfig |   30 ++++++++++++++++++++----------
> >>  1 file changed, 20 insertions(+), 10 deletions(-)
> >>
> >>diff --git a/arch/mips/cavium-octeon/Kconfig
> >>b/arch/mips/cavium-octeon/Kconfig index 227705d..c5e9975 100644
> >>--- a/arch/mips/cavium-octeon/Kconfig
> >>+++ b/arch/mips/cavium-octeon/Kconfig
> [...]
> >>-config CAVIUM_OCTEON_CVMSEG_SIZE
> >>-	int "Number of L1 cache lines reserved for CVMSEG memory"
> >>-	range 0 54
> >>-	default 1
> >>+config CAVIUM_OCTEON_HW_FIX_UNALIGNED
> >>+	bool "Enable hardware fixups of unaligned loads and stores"
> >>+	default "y"
> >
> >Is adding CAVIUM_OCTEON_HW_FIX_UNALIGNED in this patch intentional? It seems
> >unrelated.
> >
> 
> Good catch.  CAVIUM_OCTEON_HW_FIX_UNALIGNED and its users were
> removed, we shouldn't add it back.  I think this is a case of
> rebasing gone wrong.


Oops, sorry, that wasn't intentional.
James, thanks for catching this.


Andreas