From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Daney Subject: Re: [PATCH 03/15] MIPS: OCTEON: Move CAVIUM_OCTEON_CVMSEG_SIZE to CPU_CAVIUM_OCTEON Date: Tue, 20 May 2014 16:23:03 -0700 Message-ID: <537BE3D7.1070904@caviumnetworks.com> References: <1400597236-11352-1-git-send-email-andreas.herrmann@caviumnetworks.com> <1400597236-11352-4-git-send-email-andreas.herrmann@caviumnetworks.com> <3124276.AVUgu1xWyv@radagast> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Cc: , Andreas Herrmann , David Daney , Ralf Baechle , , David Daney To: James Hogan Return-path: Received: from mail-bn1lp0139.outbound.protection.outlook.com ([207.46.163.139]:29476 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750858AbaETXXH (ORCPT ); Tue, 20 May 2014 19:23:07 -0400 In-Reply-To: <3124276.AVUgu1xWyv@radagast> Sender: kvm-owner@vger.kernel.org List-ID: 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 >> >> CVMSEG is related to the CPU core not the SoC system. So needs to be >> configurable there. >> >> Signed-off-by: David Daney >> Signed-off-by: Andreas Herrmann >> --- >> 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. David Daney From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-bn1lp0145.outbound.protection.outlook.com ([207.46.163.145]:37763 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by eddie.linux-mips.org with ESMTP id S6855085AbaETXXMSR-qV (ORCPT ); Wed, 21 May 2014 01:23:12 +0200 Message-ID: <537BE3D7.1070904@caviumnetworks.com> Date: Tue, 20 May 2014 16:23:03 -0700 From: David Daney MIME-Version: 1.0 Subject: Re: [PATCH 03/15] MIPS: OCTEON: Move CAVIUM_OCTEON_CVMSEG_SIZE to CPU_CAVIUM_OCTEON References: <1400597236-11352-1-git-send-email-andreas.herrmann@caviumnetworks.com> <1400597236-11352-4-git-send-email-andreas.herrmann@caviumnetworks.com> <3124276.AVUgu1xWyv@radagast> In-Reply-To: <3124276.AVUgu1xWyv@radagast> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Return-Path: Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: James Hogan Cc: linux-mips@linux-mips.org, Andreas Herrmann , David Daney , Ralf Baechle , kvm@vger.kernel.org, David Daney Message-ID: <20140520232303.BztycKgllE7fHm8RWF9ii6kKyfz0jjSg9RzIgMABZZg@z> 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 >> >> CVMSEG is related to the CPU core not the SoC system. So needs to be >> configurable there. >> >> Signed-off-by: David Daney >> Signed-off-by: Andreas Herrmann >> --- >> 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. David Daney