* [PATCH AUTOSEL for 4.15 047/189] MIPS: Fix clean of vmlinuz.{32,ecoff,bin,srec}
[not found] <20180409001637.162453-1-alexander.levin@microsoft.com>
@ 2018-04-09 0:17 ` Sasha Levin
2018-04-09 0:17 ` [PATCH AUTOSEL for 4.15 048/189] clk: ingenic: Fix recalc_rate for clocks with fixed divider Sasha Levin
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Sasha Levin @ 2018-04-09 0:17 UTC (permalink / raw)
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: James Hogan, Ralf Baechle, linux-mips@linux-mips.org, Sasha Levin
From: James Hogan <jhogan@kernel.org>
[ Upstream commit 5f2483eb2423152445b39f2db59d372f523e664e ]
Make doesn't expand shell style "vmlinuz.{32,ecoff,bin,srec}" to the 4
separate files, so none of these files get cleaned up by make clean.
List the files separately instead.
Fixes: ec3352925b74 ("MIPS: Remove all generated vmlinuz* files on "make clean"")
Signed-off-by: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18491/
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
arch/mips/boot/compressed/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index c675eece389a..adce180f3ee4 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -133,4 +133,8 @@ vmlinuz.srec: vmlinuz
uzImage.bin: vmlinuz.bin FORCE
$(call if_changed,uimage,none)
-clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec}
+clean-files += $(objtree)/vmlinuz
+clean-files += $(objtree)/vmlinuz.32
+clean-files += $(objtree)/vmlinuz.ecoff
+clean-files += $(objtree)/vmlinuz.bin
+clean-files += $(objtree)/vmlinuz.srec
--
2.15.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH AUTOSEL for 4.15 048/189] clk: ingenic: Fix recalc_rate for clocks with fixed divider
[not found] <20180409001637.162453-1-alexander.levin@microsoft.com>
2018-04-09 0:17 ` [PATCH AUTOSEL for 4.15 047/189] MIPS: Fix clean of vmlinuz.{32,ecoff,bin,srec} Sasha Levin
@ 2018-04-09 0:17 ` Sasha Levin
2018-04-09 20:12 ` James Hogan
2018-04-09 0:17 ` [PATCH AUTOSEL for 4.15 049/189] MIPS: JZ4770: Work around config2 misreporting associativity Sasha Levin
` (3 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Sasha Levin @ 2018-04-09 0:17 UTC (permalink / raw)
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Paul Cercueil, Ralf Baechle, Maarten ter Huurne,
linux-mips@linux-mips.org, James Hogan, Sasha Levin
From: Paul Cercueil <paul@crapouillou.net>
[ Upstream commit e6cfa64375d34a6c8c1861868a381013b2d3b921 ]
Previously, the clocks with a fixed divider would report their rate
as being the same as the one of their parent, independently of the
divider in use. This commit fixes this behaviour.
This went unnoticed as neither the jz4740 nor the jz4780 CGU code
have clocks with fixed dividers yet.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Maarten ter Huurne <maarten@treewalker.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18477/
Signed-off-by: James Hogan <jhogan@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
drivers/clk/ingenic/cgu.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clk/ingenic/cgu.c b/drivers/clk/ingenic/cgu.c
index ab393637f7b0..a2e73a6d60fd 100644
--- a/drivers/clk/ingenic/cgu.c
+++ b/drivers/clk/ingenic/cgu.c
@@ -328,6 +328,8 @@ ingenic_clk_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)
div *= clk_info->div.div;
rate /= div;
+ } else if (clk_info->type & CGU_CLK_FIXDIV) {
+ rate /= clk_info->fixdiv.div;
}
return rate;
--
2.15.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH AUTOSEL for 4.15 048/189] clk: ingenic: Fix recalc_rate for clocks with fixed divider
2018-04-09 0:17 ` [PATCH AUTOSEL for 4.15 048/189] clk: ingenic: Fix recalc_rate for clocks with fixed divider Sasha Levin
@ 2018-04-09 20:12 ` James Hogan
2018-04-15 14:39 ` Sasha Levin
0 siblings, 1 reply; 9+ messages in thread
From: James Hogan @ 2018-04-09 20:12 UTC (permalink / raw)
To: Sasha Levin
Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Cercueil, Ralf Baechle, Maarten ter Huurne,
linux-mips@linux-mips.org
[-- Attachment #1: Type: text/plain, Size: 627 bytes --]
On Mon, Apr 09, 2018 at 12:17:24AM +0000, Sasha Levin wrote:
> From: Paul Cercueil <paul@crapouillou.net>
>
> [ Upstream commit e6cfa64375d34a6c8c1861868a381013b2d3b921 ]
>
> Previously, the clocks with a fixed divider would report their rate
> as being the same as the one of their parent, independently of the
> divider in use. This commit fixes this behaviour.
>
> This went unnoticed as neither the jz4740 nor the jz4780 CGU code
> have clocks with fixed dividers yet.
FYI this one isn't strictly necessary for backport since JZ4770 support
is new in 4.16, but its probably harmless too.
Cheers
James
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH AUTOSEL for 4.15 048/189] clk: ingenic: Fix recalc_rate for clocks with fixed divider
2018-04-09 20:12 ` James Hogan
@ 2018-04-15 14:39 ` Sasha Levin
2018-04-15 14:39 ` Sasha Levin
0 siblings, 1 reply; 9+ messages in thread
From: Sasha Levin @ 2018-04-15 14:39 UTC (permalink / raw)
To: James Hogan
Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Cercueil, Ralf Baechle, Maarten ter Huurne,
linux-mips@linux-mips.org
On Mon, Apr 09, 2018 at 09:12:42PM +0100, James Hogan wrote:
>On Mon, Apr 09, 2018 at 12:17:24AM +0000, Sasha Levin wrote:
>> From: Paul Cercueil <paul@crapouillou.net>
>>
>> [ Upstream commit e6cfa64375d34a6c8c1861868a381013b2d3b921 ]
>>
>> Previously, the clocks with a fixed divider would report their rate
>> as being the same as the one of their parent, independently of the
>> divider in use. This commit fixes this behaviour.
>>
>> This went unnoticed as neither the jz4740 nor the jz4780 CGU code
>> have clocks with fixed dividers yet.
>
>FYI this one isn't strictly necessary for backport since JZ4770 support
>is new in 4.16, but its probably harmless too.
>
>Cheers
>James
I'll drop it, thanks James!
From Alexander.Levin@microsoft.com Sun Apr 15 16:44:54 2018
Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 15 Apr 2018 16:45:01 +0200 (CEST)
Received: from mail-bn3nam01on0123.outbound.protection.outlook.com ([104.47.33.123]:61628
"EHLO NAM01-BN3-obe.outbound.protection.outlook.com"
rhost-flags-OK-OK-OK-FAIL) by eddie.linux-mips.org with ESMTP
id S23993928AbeDOOoympcsu convert rfc822-to-8bit (ORCPT
<rfc822;linux-mips@linux-mips.org>); Sun, 15 Apr 2018 16:44:54 +0200
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version;
bh=/WCryBd9VzOzpYgFtzgBQew3l6acjwTMOlgYARTrMmM=;
b=FLa0k2otLxrhPgbWlZAg7fcOh296xQR7eMOgDpgicyboOmC7vslbkOmh4+uaosl8adMRYuWG0irIwWpw285fvfuQ0aqcaQ5YM7UH+/nVABHUf8jf4thrDiWFaS/83CUozaveZpjzMGmclEMXZ5DXq0DY0v4VjHMAgoho0gnuRhI=
Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by
DM5PR2101MB0983.namprd21.prod.outlook.com (52.132.133.29) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.696.0; Sun, 15 Apr 2018 14:44:45 +0000
Received: from DM5PR2101MB1032.namprd21.prod.outlook.com
([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com
([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0715.004; Sun, 15 Apr 2018
14:44:45 +0000
From: Sasha Levin <Alexander.Levin@microsoft.com>
To: James Hogan <jhogan@kernel.org>
CC: "stable@vger.kernel.org" <stable@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Maarten ter Huurne <maarten@treewalker.org>,
Ralf Baechle <ralf@linux-mips.org>,
"linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
Subject: Re: [PATCH AUTOSEL for 4.14 043/161] MIPS: JZ4770: Work around
config2 misreporting associativity
Thread-Topic: [PATCH AUTOSEL for 4.14 043/161] MIPS: JZ4770: Work around
config2 misreporting associativity
Thread-Index: AQHTz5iLqRoxliRgSEKMEGprDVcqeKP43ecAgAkTfIA=
Date: Sun, 15 Apr 2018 14:44:45 +0000
Message-ID: <20180415144443.GR2341@sasha-vm>
References: <20180409001936.162706-1-alexander.levin@microsoft.com>
<20180409001936.162706-43-alexander.levin@microsoft.com>
<20180409200838.GB17347@saruman>
In-Reply-To: <20180409200838.GB17347@saruman>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
x-originating-ip: [52.168.54.252]
x-ms-publictraffictype: Email
x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0983;7:Q++DI3ASyEbCG5EVKjNslATTlF2txQh+AtKqxNXOGMU6r7Jk9+xKOR/qjRevx9us/EBokjVcrXq65jqwQw3DT7QZ5Kylz3WByXuDWvTLRUps1UvGrCHYYiJqguaR2PV7KOzXU6DjVlM/Gt8zOtNDYZOHZWqBvz29+V1IbAtthzsGtygJUBKi7aR8QP55rx1bNvxyGZMsY6hv/axt0uXCVHMWJ6zwOjoDWYAka2u/tFaBAcZhXvJhTtD9bhX81TGY;20:d5MOXPuEmSRApExA3HlWA8lzY753WXwS5PDiaJPVhsvWPmkXOMZimwfGer3MsL/UlmnngVp/mCEyUY4VnGO38Y84oIW4IgSdGdmcyOu/3FGibvWroC1pgn26XWGLB7TxDK8XTdUClbDqoMDJ0KPCIA/VnlAOm/NjBJbusPSFMfc=
x-ms-exchange-antispam-srfa-diagnostics: SOS;
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0983;
x-ms-traffictypediagnostic: DM5PR2101MB0983:
authentication-results: spf=none (sender IP is )
smtp.mailfrom=Alexander.Levin@microsoft.com;
x-microsoft-antispam-prvs: <DM5PR2101MB0983E356357457C7833E7953FBB10@DM5PR2101MB0983.namprd21.prod.outlook.com>
x-exchange-antispam-report-test: UriScan:;
x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231232)(944501347)(52105095)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB0983;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0983;
x-forefront-prvs: 0643BDA83C
x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(7916004)(366004)(396003)(39380400002)(376002)(39860400002)(346002)(199004)(189003)(6506007)(5250100002)(7736002)(102836004)(229853002)(6916009)(9686003)(6512007)(99286004)(76176011)(305945005)(33896004)(2906002)(1076002)(575784001)(86362001)(3660700001)(86612001)(53936002)(2900100001)(106356001)(3280700002)(105586002)(33656002)(6246003)(486006)(22452003)(10090500001)(14454004)(476003)(11346002)(72206003)(446003)(25786009)(26005)(6116002)(3846002)(66066001)(33716001)(6486002)(4326008)(68736007)(186003)(5660300001)(316002)(10290500003)(97736004)(8936002)(8676002)(81166006)(81156014)(6436002)(478600001)(54906003)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0983;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: microsoft.com does not designate
permitted sender hosts)
x-microsoft-antispam-message-info: l41PTpopSZeySvanoB+L8z6kaT/U0fBkHzTJMSPGmPplYIkX4b2+7an50XRsY4iA51XPp/LKw7EJ1eUtAFEAID0PlfVhGqLg4jV3pGcau58V968GDMLSGa046asDJpEHntgNRYwGtP8BaAUWK0D6F1tB6CmHYoGKe38DNk24xcTh5Lz7B3Zi3xdWjLzhOBnD
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-ID: <A4189D4C1E5693469236E6E4724659E0@namprd21.prod.outlook.com>
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-MS-Office365-Filtering-Correlation-Id: 46ab6969-bcf2-4ba9-90d8-08d5a2df6e32
X-OriginatorOrg: microsoft.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 46ab6969-bcf2-4ba9-90d8-08d5a2df6e32
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Apr 2018 14:44:45.1486
(UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0983
Return-Path: <Alexander.Levin@microsoft.com>
X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0)
X-Orcpt: rfc822;linux-mips@linux-mips.org
Original-Recipient: rfc822;linux-mips@linux-mips.org
X-archive-position: 63535
X-ecartis-version: Ecartis v1.0.0
Sender: linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: Alexander.Levin@microsoft.com
Precedence: bulk
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
List-software: Ecartis version 1.0.0
List-Id: linux-mips <linux-mips.eddie.linux-mips.org>
X-List-ID: linux-mips <linux-mips.eddie.linux-mips.org>
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
X-list: linux-mips
Content-Length: 607
Lines: 17
On Mon, Apr 09, 2018 at 09:08:38PM +0100, James Hogan wrote:
>On Mon, Apr 09, 2018 at 12:20:20AM +0000, Sasha Levin wrote:
>> From: Maarten ter Huurne <maarten@treewalker.org>
>>
>> [ Upstream commit 1f7412e0e2f327fe7dc5a0c2fc36d7b319d05d47 ]
>>
>> According to config2, the associativity would be 5-ways, but the
>> documentation states 4-ways, which also matches the documented
>> L2 cache size of 256 kB.
>
>JZ4770 support is new in 4.16, so no need for this to be backported.
>More likely it'll just break the build due to references to
>MACH_INGENIC_JZ4770.
>
>Cheers
>James
Now removed, thanks James!
From BATV+7d17fcac680d61fee2d2+5348+infradead.org+hch@bombadil.srs.infradead.org Sun Apr 15 16:59:55 2018
Received: with ECARTIS (v1.0.0; list linux-mips); Sun, 15 Apr 2018 17:00:01 +0200 (CEST)
Received: from bombadil.infradead.org ([IPv6:2607:7c80:54:e::133]:39450 "EHLO
bombadil.infradead.org" rhost-flags-OK-OK-OK-OK)
by eddie.linux-mips.org with ESMTP id S23993885AbeDOO7zMueKu (ORCPT
<rfc822;linux-mips@linux-mips.org>); Sun, 15 Apr 2018 16:59:55 +0200
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=infradead.org; s=bombadil.20170209; h=Message-Id:Date:Subject:Cc:To:From:
Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:
Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:
Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:
List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;
bh=LYPaiE3wDJg0+pilf34gNm69Ac6EUWTYANNPb1A4Fc4=; b=H1P+SOjvgGHTR/YoB2n/G8EwJ
OH0+VVE2IzyAI9A9rdAGJwA5TqSv6ElOuuGVbegAZFozPMcSR9IIPPOiYSitlkaLmpsDknKYw1bGi
UruhsaQbO+N1pTkpSDY1g5pmopb2ZURccx8pv4ttITWKeIn8gPyR2I+XXWBBY+3uvBF8xi8t+hVO3
r83Vnc8QyXQ9+tOHLXJzya1A5MYqbzcFzdpEXARaj61lyDEcWU2r4JWD8uR7WdMkhh9GN2skgIjNP
ZGBqvcj9qLY+PJIdYYdwy4Q89G6HuWvZ9nsAjaukVv+2DzXATWnFVc74YavAn6yZdRvJXjpJlHCnm
vk2Av2dgA==;
Received: from 089144200254.atnat0009.highway.a1.net ([89.144.200.254] helo=localhost)
by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux))
id 1f7j89-0005Zl-NC; Sun, 15 Apr 2018 14:59:50 +0000
From: Christoph Hellwig <hch@lst.de>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
iommu@lists.linux-foundation.org
Cc: x86@kernel.org, linux-block@vger.kernel.org,
linux-pci@vger.kernel.org, linux-mm@kvack.org,
linux-ide@vger.kernel.org, linux-mips@linux-mips.org,
sparclinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: centralize SWIOTLB config symbol and misc other cleanups
Date: Sun, 15 Apr 2018 16:59:35 +0200
Message-Id: <20180415145947.1248-1-hch@lst.de>
X-Mailer: git-send-email 2.17.0
X-SRS-Rewrite: SMTP reverse-path rewritten from <hch@infradead.org> by bombadil.infradead.org. See http://www.infradead.org/rpr.html
Return-Path: <BATV+7d17fcac680d61fee2d2+5348+infradead.org+hch@bombadil.srs.infradead.org>
X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0)
X-Orcpt: rfc822;linux-mips@linux-mips.org
Original-Recipient: rfc822;linux-mips@linux-mips.org
X-archive-position: 63536
X-ecartis-version: Ecartis v1.0.0
Sender: linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: hch@lst.de
Precedence: bulk
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
List-software: Ecartis version 1.0.0
List-Id: linux-mips <linux-mips.eddie.linux-mips.org>
X-List-ID: linux-mips <linux-mips.eddie.linux-mips.org>
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
X-list: linux-mips
Content-Length: 153
Lines: 4
Hi all,
this seris aims for a single defintion of the Kconfig symbol. To get
there various cleanups, mostly about config symbols are included as well.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH AUTOSEL for 4.15 048/189] clk: ingenic: Fix recalc_rate for clocks with fixed divider
2018-04-15 14:39 ` Sasha Levin
@ 2018-04-15 14:39 ` Sasha Levin
0 siblings, 0 replies; 9+ messages in thread
From: Sasha Levin @ 2018-04-15 14:39 UTC (permalink / raw)
To: James Hogan
Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Cercueil, Ralf Baechle, Maarten ter Huurne,
linux-mips@linux-mips.org
On Mon, Apr 09, 2018 at 09:12:42PM +0100, James Hogan wrote:
>On Mon, Apr 09, 2018 at 12:17:24AM +0000, Sasha Levin wrote:
>> From: Paul Cercueil <paul@crapouillou.net>
>>
>> [ Upstream commit e6cfa64375d34a6c8c1861868a381013b2d3b921 ]
>>
>> Previously, the clocks with a fixed divider would report their rate
>> as being the same as the one of their parent, independently of the
>> divider in use. This commit fixes this behaviour.
>>
>> This went unnoticed as neither the jz4740 nor the jz4780 CGU code
>> have clocks with fixed dividers yet.
>
>FYI this one isn't strictly necessary for backport since JZ4770 support
>is new in 4.16, but its probably harmless too.
>
>Cheers
>James
I'll drop it, thanks James!
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH AUTOSEL for 4.15 049/189] MIPS: JZ4770: Work around config2 misreporting associativity
[not found] <20180409001637.162453-1-alexander.levin@microsoft.com>
2018-04-09 0:17 ` [PATCH AUTOSEL for 4.15 047/189] MIPS: Fix clean of vmlinuz.{32,ecoff,bin,srec} Sasha Levin
2018-04-09 0:17 ` [PATCH AUTOSEL for 4.15 048/189] clk: ingenic: Fix recalc_rate for clocks with fixed divider Sasha Levin
@ 2018-04-09 0:17 ` Sasha Levin
2018-04-09 0:18 ` [PATCH AUTOSEL for 4.15 147/189] MIPS: generic: Fix machine compatible matching Sasha Levin
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Sasha Levin @ 2018-04-09 0:17 UTC (permalink / raw)
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Maarten ter Huurne, Ralf Baechle, linux-mips@linux-mips.org,
James Hogan, Sasha Levin
From: Maarten ter Huurne <maarten@treewalker.org>
[ Upstream commit 1f7412e0e2f327fe7dc5a0c2fc36d7b319d05d47 ]
According to config2, the associativity would be 5-ways, but the
documentation states 4-ways, which also matches the documented
L2 cache size of 256 kB.
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Reviewed-by: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18488/
Signed-off-by: James Hogan <jhogan@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
arch/mips/mm/sc-mips.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c
index 548acb7f8557..394673991bab 100644
--- a/arch/mips/mm/sc-mips.c
+++ b/arch/mips/mm/sc-mips.c
@@ -16,6 +16,7 @@
#include <asm/mmu_context.h>
#include <asm/r4kcache.h>
#include <asm/mips-cps.h>
+#include <asm/bootinfo.h>
/*
* MIPS32/MIPS64 L2 cache handling
@@ -220,6 +221,14 @@ static inline int __init mips_sc_probe(void)
else
return 0;
+ /*
+ * According to config2 it would be 5-ways, but that is contradicted
+ * by all documentation.
+ */
+ if (current_cpu_type() == CPU_JZRISC &&
+ mips_machtype == MACH_INGENIC_JZ4770)
+ c->scache.ways = 4;
+
c->scache.waysize = c->scache.sets * c->scache.linesz;
c->scache.waybit = __ffs(c->scache.waysize);
--
2.15.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH AUTOSEL for 4.15 147/189] MIPS: generic: Fix machine compatible matching
[not found] <20180409001637.162453-1-alexander.levin@microsoft.com>
` (2 preceding siblings ...)
2018-04-09 0:17 ` [PATCH AUTOSEL for 4.15 049/189] MIPS: JZ4770: Work around config2 misreporting associativity Sasha Levin
@ 2018-04-09 0:18 ` Sasha Levin
2018-04-09 0:18 ` [PATCH AUTOSEL for 4.15 148/189] MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS Sasha Levin
2018-04-09 0:18 ` [PATCH AUTOSEL for 4.15 150/189] MIPS: Generic: Support GIC in EIC mode Sasha Levin
5 siblings, 0 replies; 9+ messages in thread
From: Sasha Levin @ 2018-04-09 0:18 UTC (permalink / raw)
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: James Hogan, Ralf Baechle, linux-mips@linux-mips.org, Sasha Levin
From: James Hogan <jhogan@kernel.org>
[ Upstream commit 9a9ab3078e2744a1a55163cfaec73a5798aae33e ]
We now have a platform (Ranchu) in the "generic" platform which matches
based on the FDT compatible string using mips_machine_is_compatible(),
however that function doesn't stop at a blank struct
of_device_id::compatible as that is an array in the struct, not a
pointer to a string.
Fix the loop completion to check the first byte of the compatible array
rather than the address of the compatible array in the struct.
Fixes: eed0eabd12ef ("MIPS: generic: Introduce generic DT-based board support")
Signed-off-by: James Hogan <jhogan@kernel.org>
Reviewed-by: Paul Burton <paul.burton@mips.com>
Reviewed-by: Matt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18580/
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
arch/mips/include/asm/machine.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/machine.h b/arch/mips/include/asm/machine.h
index e0d9b373d415..f83879dadd1e 100644
--- a/arch/mips/include/asm/machine.h
+++ b/arch/mips/include/asm/machine.h
@@ -52,7 +52,7 @@ mips_machine_is_compatible(const struct mips_machine *mach, const void *fdt)
if (!mach->matches)
return NULL;
- for (match = mach->matches; match->compatible; match++) {
+ for (match = mach->matches; match->compatible[0]; match++) {
if (fdt_node_check_compatible(fdt, 0, match->compatible) == 0)
return match;
}
--
2.15.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH AUTOSEL for 4.15 148/189] MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS
[not found] <20180409001637.162453-1-alexander.levin@microsoft.com>
` (3 preceding siblings ...)
2018-04-09 0:18 ` [PATCH AUTOSEL for 4.15 147/189] MIPS: generic: Fix machine compatible matching Sasha Levin
@ 2018-04-09 0:18 ` Sasha Levin
2018-04-09 0:18 ` [PATCH AUTOSEL for 4.15 150/189] MIPS: Generic: Support GIC in EIC mode Sasha Levin
5 siblings, 0 replies; 9+ messages in thread
From: Sasha Levin @ 2018-04-09 0:18 UTC (permalink / raw)
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Matt Redfearn, Ralf Baechle, linux-mips@linux-mips.org,
James Hogan, Sasha Levin
From: Matt Redfearn <matt.redfearn@mips.com>
[ Upstream commit 0cde5b44a30f1daaef1c34e08191239dc63271c4 ]
When commit b27311e1cace ("MIPS: TXx9: Add RBTX4939 board support")
added board support for the RBTX4939, it added a call to
led_classdev_register even if the LED class is built as a module.
Built-in arch code cannot call module code directly like this. Commit
b33b44073734 ("MIPS: TXX9: use IS_ENABLED() macro") subsequently
changed the inclusion of this code to a single check that
CONFIG_LEDS_CLASS is either builtin or a module, but the same issue
remains.
This leads to MIPS allmodconfig builds failing when CONFIG_MACH_TX49XX=y
is set:
arch/mips/txx9/rbtx4939/setup.o: In function `rbtx4939_led_probe':
setup.c:(.init.text+0xc0): undefined reference to `of_led_classdev_register'
make: *** [Makefile:999: vmlinux] Error 1
Fix this by using the IS_BUILTIN() macro instead.
Fixes: b27311e1cace ("MIPS: TXx9: Add RBTX4939 board support")
Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
Reviewed-by: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18544/
Signed-off-by: James Hogan <jhogan@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
arch/mips/txx9/rbtx4939/setup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c
index 8b937300fb7f..fd26fadc8617 100644
--- a/arch/mips/txx9/rbtx4939/setup.c
+++ b/arch/mips/txx9/rbtx4939/setup.c
@@ -186,7 +186,7 @@ static void __init rbtx4939_update_ioc_pen(void)
#define RBTX4939_MAX_7SEGLEDS 8
-#if IS_ENABLED(CONFIG_LEDS_CLASS)
+#if IS_BUILTIN(CONFIG_LEDS_CLASS)
static u8 led_val[RBTX4939_MAX_7SEGLEDS];
struct rbtx4939_led_data {
struct led_classdev cdev;
@@ -261,7 +261,7 @@ static inline void rbtx4939_led_setup(void)
static void __rbtx4939_7segled_putc(unsigned int pos, unsigned char val)
{
-#if IS_ENABLED(CONFIG_LEDS_CLASS)
+#if IS_BUILTIN(CONFIG_LEDS_CLASS)
unsigned long flags;
local_irq_save(flags);
/* bit7: reserved for LED class */
--
2.15.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH AUTOSEL for 4.15 150/189] MIPS: Generic: Support GIC in EIC mode
[not found] <20180409001637.162453-1-alexander.levin@microsoft.com>
` (4 preceding siblings ...)
2018-04-09 0:18 ` [PATCH AUTOSEL for 4.15 148/189] MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS Sasha Levin
@ 2018-04-09 0:18 ` Sasha Levin
5 siblings, 0 replies; 9+ messages in thread
From: Sasha Levin @ 2018-04-09 0:18 UTC (permalink / raw)
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Matt Redfearn, Ralf Baechle, linux-mips@linux-mips.org,
James Hogan, Sasha Levin
From: Matt Redfearn <matt.redfearn@mips.com>
[ Upstream commit 7bf8b16d1b60419c865e423b907a05f413745b3e ]
The GIC supports running in External Interrupt Controller (EIC) mode,
and will signal this via cpu_has_veic if enabled in hardware. Currently
the generic kernel will panic if cpu_has_veic is set - but the GIC can
legitimately set this flag if either configured to boot in EIC mode, or
if the GIC driver enables this mode. Make the kernel not panic in this
case, and instead just check if the GIC is present. If so, use it's CPU
local interrupt routing functions. If an EIC is present, but it is not
the GIC, then the kernel does not know how to get the VIRQ for the CPU
local interrupts and should panic. Support for alternative EICs being
present is needed here for the generic kernel to support them.
Suggested-by: Paul Burton <paul.burton@mips.com>
Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18191/
Signed-off-by: James Hogan <jhogan@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
arch/mips/generic/irq.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/mips/generic/irq.c b/arch/mips/generic/irq.c
index 394f8161e462..cb7fdaeef426 100644
--- a/arch/mips/generic/irq.c
+++ b/arch/mips/generic/irq.c
@@ -22,10 +22,10 @@ int get_c0_fdc_int(void)
{
int mips_cpu_fdc_irq;
- if (cpu_has_veic)
- panic("Unimplemented!");
- else if (mips_gic_present())
+ if (mips_gic_present())
mips_cpu_fdc_irq = gic_get_c0_fdc_int();
+ else if (cpu_has_veic)
+ panic("Unimplemented!");
else if (cp0_fdc_irq >= 0)
mips_cpu_fdc_irq = MIPS_CPU_IRQ_BASE + cp0_fdc_irq;
else
@@ -38,10 +38,10 @@ int get_c0_perfcount_int(void)
{
int mips_cpu_perf_irq;
- if (cpu_has_veic)
- panic("Unimplemented!");
- else if (mips_gic_present())
+ if (mips_gic_present())
mips_cpu_perf_irq = gic_get_c0_perfcount_int();
+ else if (cpu_has_veic)
+ panic("Unimplemented!");
else if (cp0_perfcount_irq >= 0)
mips_cpu_perf_irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq;
else
@@ -54,10 +54,10 @@ unsigned int get_c0_compare_int(void)
{
int mips_cpu_timer_irq;
- if (cpu_has_veic)
- panic("Unimplemented!");
- else if (mips_gic_present())
+ if (mips_gic_present())
mips_cpu_timer_irq = gic_get_c0_compare_int();
+ else if (cpu_has_veic)
+ panic("Unimplemented!");
else
mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
--
2.15.1
^ permalink raw reply related [flat|nested] 9+ messages in thread