From patchwork Sat Dec 17 22:04:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 13075931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79946C4332F for ; Sat, 17 Dec 2022 22:04:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229964AbiLQWEp (ORCPT ); Sat, 17 Dec 2022 17:04:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229469AbiLQWEn (ORCPT ); Sat, 17 Dec 2022 17:04:43 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0C37E010 for ; Sat, 17 Dec 2022 14:04:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1671314680; bh=lPhOkcviP5cIFEr/v7cW3NawV3oKdVOmZI/JsrKubSI=; h=X-UI-Sender-Class:From:To:Subject:Date; b=Pq7w4qkIkh/mkBeMrdtQArLO63cry8Ul2YoeZcMgXCDYp4mWSN+YkpvjKQYk4LiWn Wq03hbTZ0z62LXN/HiPcFfJd6hQzVpjoTh6nbJ3zb3M6Cf0I48b+PGO/QYz/w1ZweP zs8EVidqC+l5bgCXfMAwlseO0KHwQ5VKBQ/1PgVsXxNu+W/UF6FRBhDBfDQzP5TLMK 0uiBDJQiXBRepMjzGgy8xNB7YLY07cHVSPtw3gvRA+Ok7EE6bDVtLqHSda3CC3EhHL KWoNflgD6OWNfDy4gc+biLl9S7VAeYNNjintEzn5iNIOdbNFT2pfVQwGCKgCvegiUT sHeXXmAd9WYZQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([92.116.160.18]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Mw9UE-1ooARH3vnQ-00s2a5 for ; Sat, 17 Dec 2022 23:04:39 +0100 From: Helge Deller To: linux-parisc@vger.kernel.org Subject: [PATCH 1/6] parisc: Drop PMD_SHIFT from calculation in pgtable.h Date: Sat, 17 Dec 2022 23:04:23 +0100 Message-Id: <20221217220428.383330-1-deller@gmx.de> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:8QRu3spDNW0+hHA6cvK2ZYBUErBk93cxPhyXYDb1UuBhzoR0+lS EXU5MrSzqxKDKNmPE9CV7zYGSTk/XcY22hURS8D8o6ysCU7N9uidvQaMkfgaay1rJ6OGV/7 1oG3t+HBgeF3Ym9shqgABXmISyDyIKGJ4q3TEKq8dSelVua8j39dXe2yFS9NuJWwnUHdvoC xFh+csdYBDkeQhSWjgjXQ== UI-OutboundReport: notjunk:1;M01:P0:bIpo4XhEDkI=;4x4guHmVcDFDnmdfa+N8fv5HiS9 /0F2QXfTAYin3Gm/YWym30cKJg4b70lnbUYBoNkItCKfbcpH4D3oqFH6zZm3YlBL0wE1O7IJz +O9GFr2WYm6b59yqK8au9Q+iX1pkv08Ht1UduOt9fQmTXHxXdorwZkDfwancpJ2rgYnV16yCq wHUQSLJu5ULAx9jS+SS2U/sEbcVx8e5GhpHD2weBRFi9RvL+M/tUfpCXddNyR6bcTrOJdO41Q F5YHdYMsUBKPxh9HAB9Xv4NkMKrEsvKMJkDwtAgyKaZNZSdGaNlsupIPKeB7Xy5Tg51BylsCT XG99ifOseRCAcHknKtxB8mPXycBKXpsH5MbizQyjXLaGXddsaCXBzEokc/K7u7VIdZ4DL9Br3 OLO4R8T/C6b+XC5gRPFlBSa+MEaSUUPk72qM2Jfdr3p9lLzimNlOpDbFwkPYM/bLAK6O4ZKxW hjwAfbHx+EEBahRaDAZtdUymG+N8u9octMJ5VIuAWbj9XXpvFy7YaRjtBvq0fcwiY0bdD7SgO 2VjA/FemCyW3NGvWHq9IrK6CMuUyshkz1l0OuCR2DU5k5V01TLP16o3mBYOUiO9K7LG2jUj8T 3/9r2xwpeIaGekPEORLmQMrS6qCPdMVCbK3iePK6aThvrR7fMPXaULc3s/vKqKhUZrp2e5FCO jvLvq2YtaMNA8FP6E9SpjCl0SZbu0mTEDrzrABM0Ee5exlz0aJrIldMJHghPeBY2d+HWpNN8a SyvGwKFcZ1Sc8kCenZYrmQqnFFpQgR9Y81VHVME2BvQz+A5T/b9GKlKMFFMJiaDjKuVSglaHS rx5D3fSTzY1IqsZE35LsZDiigPmTwBSHfO35iaCE+pOyBIgJ3clPNbHYUam9J2dadfN0jvPfu 1HosrqkPM3tisVl+PkgQufmhHT/QheD8cYQDF6OA/KKUnYswHLab0mOA5K3OLkFvx+XpK/FUU g50wRj7Roe/Gnh34Y0kOQfmbfx0= Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org PMD_SHIFT isn't defined if CONFIG_PGTABLE_LEVELS == 3, and as such the kernel test robot found this warning: In file included from include/linux/pgtable.h:6, from arch/parisc/kernel/head.S:23: arch/parisc/include/asm/pgtable.h:169:32: warning: "PMD_SHIFT" is not defined, evaluates to 0 [-Wundef] 169 | #if (KERNEL_INITIAL_ORDER) >= (PMD_SHIFT) Avoid the warning by using PLD_SHIFT and BITS_PER_PTE. Signed-off-by: Helge Deller Reported-by: kernel test robot --- arch/parisc/include/asm/pgtable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.38.1 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h index ecd028854469..68ae77069d23 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h @@ -166,8 +166,8 @@ extern void __update_cache(pte_t pte); /* This calculates the number of initial pages we need for the initial * page tables */ -#if (KERNEL_INITIAL_ORDER) >= (PMD_SHIFT) -# define PT_INITIAL (1 << (KERNEL_INITIAL_ORDER - PMD_SHIFT)) +#if (KERNEL_INITIAL_ORDER) >= (PLD_SHIFT + BITS_PER_PTE) +# define PT_INITIAL (1 << (KERNEL_INITIAL_ORDER - PLD_SHIFT - BITS_PER_PTE)) #else # define PT_INITIAL (1) /* all initial PTEs fit into one page */ #endif From patchwork Sat Dec 17 22:04:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 13075933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51BBFC4332F for ; Sat, 17 Dec 2022 22:04:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229611AbiLQWEr (ORCPT ); Sat, 17 Dec 2022 17:04:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229624AbiLQWEn (ORCPT ); Sat, 17 Dec 2022 17:04:43 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B90AEE011 for ; Sat, 17 Dec 2022 14:04:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1671314680; bh=xVbiTtplwHmDVtHBadwsyLXpl9f0VXl5L8XmpuJkw6U=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=VglpqwP8lqfD/AmG1Kz0+0rdrrvqYbLAkPHrFO5Pv24ztD6mt8guuaFstlqZouTHx k+2CjOu8OidYJNuTPGX2zSjgb7AtK5mtRyc5YVaay9MuS6ioFBjifKsA0viwKfsolq iUkYLLkrQS950B74+qsLYmYnxG0nhhZApN8QTVaRj4s7IrnzTrALSNePSaYw1hI6W2 Kq3htq5rXYU4gQVmfUb0JTqDWSGsmwUUHRdg5RR+ruRlzdK7MRo79xDKIxRm2/n/YO HQ+l4dQ4/cTv+fitAE3eDXZSOSpO+9xI6poq1BBxv0p3omvCg8M13TdxGqFR5YK//P q8HGDcZANwmIQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([92.116.160.18]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MhU5R-1oSupH07MZ-00ee3e for ; Sat, 17 Dec 2022 23:04:40 +0100 From: Helge Deller To: linux-parisc@vger.kernel.org Subject: [PATCH 2/6] parisc: Fix locking in pdc_iodc_print() firmware call Date: Sat, 17 Dec 2022 23:04:24 +0100 Message-Id: <20221217220428.383330-2-deller@gmx.de> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217220428.383330-1-deller@gmx.de> References: <20221217220428.383330-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:/09C9W7JQhoE8Uj9MrEpKzYI/zBE4cqo1F0qreqQr9qYKzeVJtk gUjPKx8tgZcpMi3DkFPzqR34s6LhGTtLcoyOArLzxEt2BOhZjgUAfXVGddouxKUCFMeYdDH h9vcIXwn2wV4p2afntNZh2dCYOPkbD0JjvXpkgdM0we1u3z5qLGHvtnjef3NobsrN1NhlEH fJeGgLdRhzwvVWJxJ86HA== UI-OutboundReport: notjunk:1;M01:P0:JYeKNydDv7w=;E5nbiLTJ2va3RF2wbfZ+NclldAQ EO0/3Q42+HZ3iVSuE2u4RmcRbVUJPCZY3HpjydYv263f9vziC/g85Hve2CqVprICBXk3KTBqO XoIPOF1SJVUTWG2mLtBfmswX91Tmx/Q+1G3oCDOVX+ergfRQzdUEvIyoGyCQpCQMMdySreMbB ByCUwUjhJ2L39PrHrsk6NeHDRcwpXdu5X2fNW8ehdWTro2kN+0a6SLDf1e9MTdByVk+/ub0RJ RFy1sd5AqnLCE8lXLqVTUh3esHuuRwpRRs/IK2uyOeI3zAefaQ6N++c2SoxDqDqbJh/3zP/fF yhSrNlF/0qcze/cA1+jKSEWkdngeCgR5YbPLPVyOgVcAof5oR0dSfM/CC7IrPO4bVi577Uu1T UOMGSrzdJoOKmrU86okHJYVBKcsf15Z4W234fjXV2w6zsmK0d1nohHuTUWWsmhLdMmHtY07VY Y7qloObgjupl6j7uOK7p79QK2Ir1s0T9m8Th5kxPSkOXMObAC56Q0fhr8S6cz3LhMv8mEbP/Y bC/g5DZFi3uZfKKDS143Kr9U7jpWnY0JTApSq1kcv5G3qcCQwN7Zt+YMvpEFyXgjFEAjypGoj gUszSF7uLA/+rGOdCmUORd8TNGViZ12CuPQb7lRacVRf09zR94wm90wr4MG3P47V84k/Cepph qCHkJVnCT+adlmyiSXGu8VMaVZK/RULOjDQqxV7k4WKgA/1Ejg7wQwwUusJ392KFW1Q4goqcd UcIx24QdTTVW9tv2vCKbR5EH3Rypb4UHyk0NIBhOc2iFLxjwz1fooL45KRWrVXoV3nzIj7UPe iaW2SUsvsaLdPlKe03rjPzLBaKfAOwjjScGrbAxqGYz3acfWwNrt4XHxyyAPWA71mQVyk63Qj rwq+Het4YkB1hWvWns44JCwSfh3buYJgyQfKKfzNiA2XTZwreKEjh8WUdgPKYEQqY/BBkxcfa sDmFtk/61eXMNlakX2+42CmtDgw= Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org Utilize pdc_lock spinlock to protect parallel modifications of the iodc_dbuf[] buffer, check length to prevent buffer overflow of iodc_dbuf[], drop the iodc_retbuf[] buffer and fix some wrong indentings. Signed-off-by: Helge Deller Cc: # 6.0+ --- arch/parisc/kernel/firmware.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.38.1 diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c index 6a7e315bcc2e..5bccf0025fbd 100644 --- a/arch/parisc/kernel/firmware.c +++ b/arch/parisc/kernel/firmware.c @@ -1288,9 +1288,8 @@ void pdc_io_reset_devices(void) #endif /* defined(BOOTLOADER) */ -/* locked by pdc_console_lock */ -static int __attribute__((aligned(8))) iodc_retbuf[32]; -static char __attribute__((aligned(64))) iodc_dbuf[4096]; +/* locked by pdc_lock */ +static char iodc_dbuf[4096] __page_aligned_bss; /** * pdc_iodc_print - Console print using IODC. @@ -1307,6 +1306,9 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) unsigned int i; unsigned long flags; + count = min_t(unsigned int, count, sizeof(iodc_dbuf)); + + spin_lock_irqsave(&pdc_lock, flags); for (i = 0; i < count;) { switch(str[i]) { case '\n': @@ -1322,12 +1324,11 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) } print: - spin_lock_irqsave(&pdc_lock, flags); - real32_call(PAGE0->mem_cons.iodc_io, - (unsigned long)PAGE0->mem_cons.hpa, ENTRY_IO_COUT, - PAGE0->mem_cons.spa, __pa(PAGE0->mem_cons.dp.layers), - __pa(iodc_retbuf), 0, __pa(iodc_dbuf), i, 0); - spin_unlock_irqrestore(&pdc_lock, flags); + real32_call(PAGE0->mem_cons.iodc_io, + (unsigned long)PAGE0->mem_cons.hpa, ENTRY_IO_COUT, + PAGE0->mem_cons.spa, __pa(PAGE0->mem_cons.dp.layers), + __pa(pdc_result), 0, __pa(iodc_dbuf), i, 0); + spin_unlock_irqrestore(&pdc_lock, flags); return i; } @@ -1354,10 +1355,10 @@ int pdc_iodc_getc(void) real32_call(PAGE0->mem_kbd.iodc_io, (unsigned long)PAGE0->mem_kbd.hpa, ENTRY_IO_CIN, PAGE0->mem_kbd.spa, __pa(PAGE0->mem_kbd.dp.layers), - __pa(iodc_retbuf), 0, __pa(iodc_dbuf), 1, 0); + __pa(pdc_result), 0, __pa(iodc_dbuf), 1, 0); ch = *iodc_dbuf; - status = *iodc_retbuf; + status = *pdc_result; spin_unlock_irqrestore(&pdc_lock, flags); if (status == 0) From patchwork Sat Dec 17 22:04:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 13075932 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0F66C4167B for ; Sat, 17 Dec 2022 22:04:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229506AbiLQWEq (ORCPT ); Sat, 17 Dec 2022 17:04:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229611AbiLQWEn (ORCPT ); Sat, 17 Dec 2022 17:04:43 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB6B3E013 for ; Sat, 17 Dec 2022 14:04:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1671314680; bh=pKwdDsCdec+OWgQwT0Z/y0rVzZh/45ZL17kX64ShjGw=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=q3ag3iH4lWvWrofU+8lHnFE+9y8wkl6Sn1wmSuMYpxARKW7t8cuK/8NG6FegVoN57 T/hUug/hvpdPhUmJmXC9M+Pyt5sWktJ1cEQtpVFIXPWdSKkbkHafav7CMIw3kNMyCH JeX/97513BSg91bTlyXmvWVFFWCExPMYtMipUho9FIDJDGxlgtXWiOQa+YY+9dYtpO 1ynewn0znWCeiP5U4VIkDgK/67Oq5rBU6TF44fCIPFzNvvTvbFWGVqidVAZSxjorkb MLNtpu4INWqR/vedIw5qf5h/FUiSYXsvAVSD5HuXDtx/nJAqsc9dJJiLeLvNW2E1Wk 5aLpaKoFRwLcQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([92.116.160.18]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N79yQ-1oqJ5Y0Rlk-017V3V for ; Sat, 17 Dec 2022 23:04:40 +0100 From: Helge Deller To: linux-parisc@vger.kernel.org Subject: [PATCH 3/6] parisc: Drop duplicate kgdb_pdc console Date: Sat, 17 Dec 2022 23:04:25 +0100 Message-Id: <20221217220428.383330-3-deller@gmx.de> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217220428.383330-1-deller@gmx.de> References: <20221217220428.383330-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:EYNo8BBWUSpsyuSWDHcuqZJc/DlcdwY91qSfMiOf9rH4XlchDo8 XcDUN3ynjiRVFGHZ2KSb0mPoSrC/8dTD3IoIvSytk+9+YEYchqoJc1ni3vsDrsZCMGH4J3K /Jx38MINIpbIETg0g8WAwSc3WIL/6zCj4K6gcEqgJGeY0jE78Wgz2J6rqnCVw57sCoQ+y7W TBefct422UNmEQJTEPkPA== UI-OutboundReport: notjunk:1;M01:P0:ydUprJsfL0A=;GBUHJlIleiSrurA2JTFNJBDunQ1 6/RLfF06VZZ3lLZtc2dJMzIKwhYp7cS7941eMwghz6yP3pJS8R4ps7QFZ6oyKH4ihQY8Jg5bR kcXTwiGllG9Fv+fcUfI34rV6lEr94+gtCOXVE3HBYhNNXXnPqWohADilOaDKmylYLkXkFzVo2 jwQluhhfKxykFRboTMj69NW9qHOyTAR/iATFaAEzFIIieESR6BAxWqIqqg1GAE7wU+qIfy/6+ Hat1xNjJh11/bjwYQYpIE4Go9NSA/iBz5Xn6xl3bmtP68x59KUC/dVFxnNvOOOxtMtmYrZZf+ PPNvFspdHoa5HhRfDLmi85yqDvp14Vg34exYkW+D2TC68VU2tBUj+hwNTkMDfq0vYM5yyV2xI +hfITTB7285K6r+S6F18afz+yo1NwcaRxjXLDvsy2etWGTwUZX5UEZTz6UGdPD8rzZLqRraCn NedMN90ucjGEC6n5BSKWDh11JDJRQ/Ib92kyu1IGvErTABs7hZeQMdBJbcQRh7jZhqfFRkyf5 N9rnw0pBphS6CXAb58qzZDT0H/B5n22VHvlP8VWSaGPRvp5LnivQHYeR2dN5TEI9zr+bPaDXb nX+OnCATyBzBdQWn1rhD9vBUznV/Y+Lc0SAd7g40alBxv2yjSe9XjWEdrx+o2xgxKoX2I6Pl6 E+OqW7vaJy1qH+D0vKqYVNxtTv82hUgy6s9tBS6J1vSxj84CH28lEEMRadZJuze2LVZm1jD9F UMQEDes8lC5Rgg+C+ep4WJgAMRiQr5DkHG7JpTjuU+1Wyf4iNH42Cs/8ZUGNQbS3kM4IksDGV J627GVKjtD8UJR2w4AGVgvpaDIwACWmWtaiz8QnCT1/zBCTAFNZyThxQYOGGgzvA1XU5Pdh0e azYptbpE7uPh19m/IwBwcuSBO8ITOHu2RRX4heA2fxvvKjHFbDzJ2UpaB2cDVZZHh0a3hunc8 28de6w== Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org The kgdb console is already implemented and registered in pdc_cons.c, so the duplicate code can be dropped. Signed-off-by: Helge Deller Cc: # 6.1+ --- arch/parisc/kernel/kgdb.c | 20 -------------------- 1 file changed, 20 deletions(-) -- 2.38.1 diff --git a/arch/parisc/kernel/kgdb.c b/arch/parisc/kernel/kgdb.c index ab7620f695be..b16fa9bac5f4 100644 --- a/arch/parisc/kernel/kgdb.c +++ b/arch/parisc/kernel/kgdb.c @@ -208,23 +208,3 @@ int kgdb_arch_handle_exception(int trap, int signo, } return -1; } - -/* KGDB console driver which uses PDC to read chars from keyboard */ - -static void kgdb_pdc_write_char(u8 chr) -{ - /* no need to print char. kgdb will do it. */ -} - -static struct kgdb_io kgdb_pdc_io_ops = { - .name = "kgdb_pdc", - .read_char = pdc_iodc_getc, - .write_char = kgdb_pdc_write_char, -}; - -static int __init kgdb_pdc_init(void) -{ - kgdb_register_io_module(&kgdb_pdc_io_ops); - return 0; -} -early_initcall(kgdb_pdc_init); From patchwork Sat Dec 17 22:04:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 13075930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ABFAC3DA6E for ; Sat, 17 Dec 2022 22:04:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229469AbiLQWEp (ORCPT ); Sat, 17 Dec 2022 17:04:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229506AbiLQWEn (ORCPT ); Sat, 17 Dec 2022 17:04:43 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB71BFAE7 for ; Sat, 17 Dec 2022 14:04:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1671314680; bh=XG4VbDB0J4izQ6gNlDnI7d1/KeFFRXC9PgG+5mF6L80=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=AOYcasQjor4I/YDn7nZfUCCpNS6zyy+7Mhbc/4R1BE5vtLTHfckm3wAKeADByCvTA gxUpDTpdlUu8urZayPnYZ1YHruvbw4bvYStyRUlHV7bxLeU688RZg7JiKPsF2539bF 7B4pK0vEtMRXZp2oEqEFp2OqHtCqaDPhXoyRqNm2UiTYrY62GhHbSCqXL9NEfre+8Z xDl5LyLfxUDCk0O1PYuDbAg48/v4+Jw3ugBbhJ7tN30TDtxG4lB5nonv/1nUB0DVUn dsx3Wku1WUV9ONMBOHOsxIh8URxZ+fOdNe+tn7+siLpwnmSe6f9YPJezTDPjqm8DTG 8vyNYVbO+ox5Q== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([92.116.160.18]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MNKm0-1pH9ve0p6Q-00Om6N for ; Sat, 17 Dec 2022 23:04:40 +0100 From: Helge Deller To: linux-parisc@vger.kernel.org Subject: [PATCH 4/6] parisc: Drop locking in pdc console code Date: Sat, 17 Dec 2022 23:04:26 +0100 Message-Id: <20221217220428.383330-4-deller@gmx.de> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217220428.383330-1-deller@gmx.de> References: <20221217220428.383330-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:tuunWJO8/QL8+ngL6cHbhGu4HwQF3unHbrOptDTKcmKxwOFsrxO Zs8ngEls43vuJ162DmQyZLBKgszpziJ28sgmhqxC21M3Wv+dvmVrj2Re+rOt3PpjRjWWPOp rkpIT/9VnUGW80e7Y5qSVU/wHaImLFEzmEgNkjT/FdxnrvIpLFrelJkvofkSteOusOyqWTa w12bcuJvgcDchDYLOswZA== UI-OutboundReport: notjunk:1;M01:P0:iWV2UMIWKYs=;wTWAeg8hTWECYaWCJyRp/WXNQNz OuJCEF2dnj4jOyOjQXupBylTtOMCk3JP9wwtTgyl8vhnqu08mck9/Ob8uhPkQ5JZuj85VGigU VreUjdPyWU08fM1QecPuRygmAtd+EQcxof0chliBfpn3LL4EPEVTgs1WzVISmFOBuDHScrAVi 4pWgr3Oebg/257S20eOiZ1A1nvWG2nfPpqDVFERlUz4UjOPP3zA1jixPUgJze7xmWoSlfmomv iiDJbD0nWCQp1K4uFjW7RVg+RuCXTamlpQu1XUKi9Wjp4W9jA9Uk4P5IhyRNUGzTQkgXz1I2f 4v2aeFN09A71+HDf4pGpYzZaACLLLm5YP0ISvUOH6/9R0UIxHyrgPd0vTlIcazTte/An5a02q kXtjznlixLqF4It2AYUfBFrkNFql6Fy8H3uRXbChe78PGPEtpJ+D3lD3mS39zOU/mWzSkTHrC 9WKOvwbhMjnG3bi3+lBm52lHViFEwKXNNzja8zlwrEGtx1MBOThIryOWrIo4vCB5ME0HGEHtj a1ETP7Ie1j0EHs2x3U8LofxEocYBp/f0e+yftV+0knronLboEYRAWdckghy5dCHyvUZNkZRfS 1FqySSqlucZSoFgKK3sx5ItAI78tO3POg6qUKvNRjzHIPDPMtmJQ6NuMRfBvcNYTxcqyu4NMF 1szDhl9S7gwcmcF7PYR5Fo75SfrFo+mUhTwmbYVreb6ajYw2FbZzYSHh2X/aQdAJMJ6p17GcD M2qzeqkACoq1Y5a2A2DFxmIVMMqbtzSif1Lg2feeMp3+nkFURNM7ZOgqvt4FRy6mBi/YGNX2f lWcikxRAZkqEuz6UYnuh2Pu6/8Xsrq2m8gDwLTTVG9bBP7CYuANl0rwFHT4xeb7h3M9c/dxY9 Sf2p9j+fI/PpXLZYB6/t1N7HdBYvg1TvYIEHFQgfeL3bMU6HhfA0wu/QQ4MHLxtg1iTYiqaAz IFOe7A== Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org No need to have specific locking for console I/O since the PDC functions provide an own locking. Signed-off-by: Helge Deller Cc: # 6.1+ --- arch/parisc/kernel/pdc_cons.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.38.1 diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c index 7d0989f523d0..df374f7b42c9 100644 --- a/arch/parisc/kernel/pdc_cons.c +++ b/arch/parisc/kernel/pdc_cons.c @@ -12,29 +12,19 @@ #include /* for PAGE0 */ #include /* for iodc_call() proto and friends */ -static DEFINE_SPINLOCK(pdc_console_lock); - static void pdc_console_write(struct console *co, const char *s, unsigned count) { int i = 0; - unsigned long flags; - spin_lock_irqsave(&pdc_console_lock, flags); do { i += pdc_iodc_print(s + i, count - i); } while (i < count); - spin_unlock_irqrestore(&pdc_console_lock, flags); } #ifdef CONFIG_KGDB static int kgdb_pdc_read_char(void) { - int c; - unsigned long flags; - - spin_lock_irqsave(&pdc_console_lock, flags); - c = pdc_iodc_getc(); - spin_unlock_irqrestore(&pdc_console_lock, flags); + int c = pdc_iodc_getc(); return (c <= 0) ? NO_POLL_CHAR : c; } From patchwork Sat Dec 17 22:04:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 13075934 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D09BC3DA79 for ; Sat, 17 Dec 2022 22:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229624AbiLQWEs (ORCPT ); Sat, 17 Dec 2022 17:04:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229735AbiLQWEn (ORCPT ); Sat, 17 Dec 2022 17:04:43 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBFE7FD30 for ; Sat, 17 Dec 2022 14:04:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1671314680; bh=77l3N0weOo3yGbHoN7xASq1Pgy0xZdMgqvZFHKiEEBE=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=ApbMBFJ/3w/MJOvXOgKnBXWjaZTINEs28OAjHoE/dnIUsrmFK+P0JevJhATQXsQyI U8aEH2mmSgjGHlJRaJfZcjBASo8frgh5Z8mvfalPGyhfgstMVcioB+sNsYTRTPLdWh WMdT5DIEKCcVyyfYWehbAZGMn/3Z6LEPb2M9AqK6q3qo5NY4aFcv1Pnqth29bSuaKz BrfZjsZSe6QkybVUtmuOjlmmj76/4L9Mt0s08Y48MYzxect3dgvzz3AYFLXuz+578H r9chi+3zyFGPLn2yx7XqygIc+fBlHllmZQByE1k5cdJTYbPw2O9oxTo5HtGXxQvviC C2FrOaILb+avA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([92.116.160.18]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MnJlW-1ofGUW1Ctg-00jLQz for ; Sat, 17 Dec 2022 23:04:40 +0100 From: Helge Deller To: linux-parisc@vger.kernel.org Subject: [PATCH 5/6] parisc: Move pdc_result struct to firmware.c Date: Sat, 17 Dec 2022 23:04:27 +0100 Message-Id: <20221217220428.383330-5-deller@gmx.de> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217220428.383330-1-deller@gmx.de> References: <20221217220428.383330-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:qsf+RXvsSSbOAFnwOcfa62z6qoicrC7W3tn7tVh3CYmJVR1t3gT W5HyQhhShqLY8eKdu0PnZIlyguUgNOzcyyPie0vHaoPynt0Mxezc4l8a+V4pHt9GTJu6x+C ArhaG5uI0b6Zsj/TCjBjjvJF25vwOAdQE614tYVNo3WIyl4jqtVAmq9xUgEZkmKWzG961fJ 7b4C2cQNaUsBr7/XwvSlw== UI-OutboundReport: notjunk:1;M01:P0:TBNbLBm30VU=;pW27XTRrgubcPYB4YXkO+5cOgOi 8fxczJ1d144mNO3yhE7eRNsv0ihlh+tBpaWcEGiH9wEelBXbeL2URB1sDtO+V2GrEPiRY/ppw y3NJXdUbefJrVjcHz5gEoZ+fH/nIDFIsHDZ2+FIJyAek4uUiFsUL6k/+ZUsNgb8meHDCzZeu+ y9Sscn+B48XfO+b1XgrvkdFkcvrbGoJUSZLMpd2PvXWFMq9ZIGjcmQ5Ip4WX+ErhtpEV9cywy KF4/kXLkLv+SET+PGi/3PIi9XW57Zvb4Q8aeY6mtCJ+OMWpAmQhUOYQ5V0nU0AXOpykAkfx6E Jag3/Ta/Mp2A4HDhrDge6tVcSafZCtibzIG58gdHd/zeVeDGfva0qdS7DNqrd8uaDeulPHwUQ 2sKXoQ5mjGEeKbiUw3C6/2g06amQ5o4syTCne/wRuTvCQtlGP/7dC7KjAC168vxgD6DSgE7kZ MYFrF/Obe+XNSyknhktXIOb2Ig3QPB7mtFzfkq9wrqx6iV0LRtjlg7ddx8MfCNR7Z8KeNWIey GEUmP7RfLf5AR1w6nxWWwcJ8UaoKReC8MCtiX3EIEHaJ770rximnYFoorZPQw03xmzhmh37zC SyEOkZ+Vc5Ft8l/tRcasRF7W7dUoYOndkhX9RMjXXRpw9Re4ZDOUvCCt8qrUmD2uwhoMjrFgi rigIvbX/uS7AnOl8RHOQy4Y32tHPKERb6q58ILnYtO2Gn95ZfwMNpa/ofPceXIS5ZENrgeqJz 9+x3uGXc9E2j0MP726OpUJLPPBrmI7kbwz6kxiLG+3Gg3gERHiHowUsA0j0PDU7IQVrkRZJ9C DACGdckmkqGQf9hv/v+PYnrVgxK73xjXiZZm4+8pgqCLA3Ig4OI+wQi0s/K4AHjZfxamZKN0x F+X2yFmuXoavUOlHujT8YSBm7bX+wUfdUkjQ2M+2/BFXF+eEih+kbZNcllmbj5A1L4YlofKVt eo/98/aVyqWj8sXVMU11WLlrPBQ= Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org Signed-off-by: Helge Deller --- arch/parisc/kernel/firmware.c | 4 ++-- arch/parisc/kernel/real2.S | 17 ++--------------- 2 files changed, 4 insertions(+), 17 deletions(-) -- 2.38.1 diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c index 5bccf0025fbd..9d7516376fbf 100644 --- a/arch/parisc/kernel/firmware.c +++ b/arch/parisc/kernel/firmware.c @@ -74,8 +74,8 @@ static DEFINE_SPINLOCK(pdc_lock); #endif -extern unsigned long pdc_result[NUM_PDC_RESULT]; -extern unsigned long pdc_result2[NUM_PDC_RESULT]; +unsigned long pdc_result[NUM_PDC_RESULT] __aligned(8); +unsigned long pdc_result2[NUM_PDC_RESULT] __aligned(8); #ifdef CONFIG_64BIT #define WIDE_FIRMWARE 0x1 diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S index 2b16d8d6598f..4dc12c4c0980 100644 --- a/arch/parisc/kernel/real2.S +++ b/arch/parisc/kernel/real2.S @@ -15,28 +15,15 @@ #include - - .section .bss - - .export pdc_result - .export pdc_result2 - .align 8 -pdc_result: - .block ASM_PDC_RESULT_SIZE -pdc_result2: - .block ASM_PDC_RESULT_SIZE - .export real_stack - .export real32_stack .export real64_stack - .align 64 + __PAGE_ALIGNED_BSS real_stack: -real32_stack: real64_stack: .block 8192 #define N_SAVED_REGS 9 - + .section .bss save_cr_space: .block REG_SZ * N_SAVED_REGS save_cr_end: From patchwork Sat Dec 17 22:04:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 13075935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB07AC4167B for ; Sat, 17 Dec 2022 22:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229735AbiLQWEt (ORCPT ); Sat, 17 Dec 2022 17:04:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229885AbiLQWEo (ORCPT ); Sat, 17 Dec 2022 17:04:44 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 066B210FC3 for ; Sat, 17 Dec 2022 14:04:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1671314680; bh=MJUMeeGXJTELJm1GrZXbuntu2SgUVWEogBmg+m1S9NA=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=l41+yF+5ZVkWlYFqS0Dbi6oqxAEqbLRhim+KUDsR8W0tSOwxN25gqJeZRt80qwoA+ OL2P/GnaEmkrAlPyf8DOY+VHHtoh45EYX/v9ij1YwtDafsVXvwPWDKibONGgWZT4wp 6+G8nE8lSiqn070o5aaAa5QNyMKdZ3mS2FZgekRWhuBVJ+C3gOBvUC4E0e2EMhmSHG /fz3YovLdf3kNc6wfn47KofDFav0R9sVQXU6IkAdH6coxVkQsTdx1CUZxupjFTfroU 5yZVJL5r7FuIQy/9FFL1tZSoa67gvwgKUngugib9VAbjPuttAJzoxS/eHDya1x699R LCpSbgaWpVzdw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([92.116.160.18]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MfHAH-1oQhtr1brv-00gqz4 for ; Sat, 17 Dec 2022 23:04:40 +0100 From: Helge Deller To: linux-parisc@vger.kernel.org Subject: [PATCH 6/6] parisc: Add missing FORCE prerequisites in Makefile Date: Sat, 17 Dec 2022 23:04:28 +0100 Message-Id: <20221217220428.383330-6-deller@gmx.de> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217220428.383330-1-deller@gmx.de> References: <20221217220428.383330-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:L3Jo+CXgEkTAIQdFjMNm2tZsk7yTW9yZy6Ku57XQxu1koVgk+u+ kAFMrJyWw7vNwXQVWqFuopa/8FQrKaXcH/rvRNgAhoMfr2U9LOnKVVMVxbl9PnF3iCeyjZV qrJsSAe1x9c0YTvZl2zw2H0X0PuQhmF21IgXjUSZzioCNs3vnoBYxukpe9ajFBQu6H32FE4 TOVZSyEot/IosjdhOEvNQ== UI-OutboundReport: notjunk:1;M01:P0:H0uH+62o8bU=;M71yV5nNK3N4U94wQNZ6DVwSvg5 KFYUw0Sk9VthdvakR5hqHN0A/QV4+3tqAL8bM8jzNuq+GmNGX4FTiK2ZBz+8yUtEF05JPikPD e0WFRQZ3ujMtsXbE+9x2nS+krBWT7bPU0eeTYP1WotWTQbIS0vCtK89RT21W5EouIUs3j7ejS HuQlQpRB++MTh5ZrjRT4KYhcn/udXhl0HkaK1Z3KLZ+GHqQNWDvakA8tWY51JPglG1GHm9lZ4 DYxOkBcbNOgFfsqR3at4pZUUUq56wp9AN72iPo8QwNbc+Jep6v9Mqda2woxQGTP0krPOWdf2y EDY8gOsRL+XMYMO9c9TCqhEcVUZ2NWDQS4JH/zzxua9+VZn70c9Go74zR6faGAeFmySzRLl/1 mQxCE5ZpEkTTq0boRqFElLhYw09qQeAOylYS4JVHR+M4pHH9jrMDBZeyPaJZnWFFX7ifGjcqr mmttJ1mVbmGMt7SSjkEfQhQ6y3+Cab52dM/x1J7L+u6Pm7cTufrYu/j2aeJVJV0vfMhfoJxC8 SBv1RDYxxHWMI+xgY6tjowr1ijwM4Hai3PYvKOi4MF3QIiyZkKum/mfVu+OrHfZenS4rNJA8Y DY5yOD1E3jYdHRBnQ6K9XT2y6s3J6FD9dh7iBvMqUS0KkgslGk6UgyYgTeptMCAaUF9oR+dPl frerESnohMgJgtavyk0jiBCABn6Pz7/zYE7pDLbzB/OCHy13J5BNdaggYYveVoygG793JWy+p OogZ3B1tNGQB5BuurZS9mPUTY73e+RPJkK3yqaH/7SJ2ri/tonhFpzQjx1KLCncv/mxHU30z+ ypB1HtHvSqYl+dK8AsxzhEFsIm4xEJnY7TPuLyVemAbJbhppHNZWhi2ntuX2yCZgFyUN47m7J 2/LlnV1NK/f/3M44uXtOx4Z3gApw9oRenuQVZ9X6w1a49q64BNOSxA+ZRakwv9wFe6Vd7QWFQ c/M3neEbMND2LF9izp5wlbJtdTs= Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org Fix those make warnings: arch/parisc/kernel/vdso32/Makefile:30: FORCE prerequisite is missing arch/parisc/kernel/vdso64/Makefile:30: FORCE prerequisite is missing Add the missing FORCE prerequisites for all build targets identified by "make help". Fixes: e1f86d7b4b2a5213 ("kbuild: warn if FORCE is missing for if_changed(_dep,_rule) and filechk") Signed-off-by: Helge Deller Cc: # 5.18+ --- arch/parisc/kernel/vdso32/Makefile | 4 ++-- arch/parisc/kernel/vdso64/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.38.1 diff --git a/arch/parisc/kernel/vdso32/Makefile b/arch/parisc/kernel/vdso32/Makefile index 85b1c6d261d1..4459a48d2303 100644 --- a/arch/parisc/kernel/vdso32/Makefile +++ b/arch/parisc/kernel/vdso32/Makefile @@ -26,7 +26,7 @@ $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so FORCE # Force dependency (incbin is bad) # link rule for the .so file, .lds has to be first -$(obj)/vdso32.so: $(src)/vdso32.lds $(obj-vdso32) $(obj-cvdso32) $(VDSO_LIBGCC) +$(obj)/vdso32.so: $(src)/vdso32.lds $(obj-vdso32) $(obj-cvdso32) $(VDSO_LIBGCC) FORCE $(call if_changed,vdso32ld) # assembly rules for the .S files @@ -38,7 +38,7 @@ $(obj-cvdso32): %.o: %.c FORCE # actual build commands quiet_cmd_vdso32ld = VDSO32L $@ - cmd_vdso32ld = $(CROSS32CC) $(c_flags) -Wl,-T $^ -o $@ + cmd_vdso32ld = $(CROSS32CC) $(c_flags) -Wl,-T $(filter-out FORCE, $^) -o $@ quiet_cmd_vdso32as = VDSO32A $@ cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $< quiet_cmd_vdso32cc = VDSO32C $@ diff --git a/arch/parisc/kernel/vdso64/Makefile b/arch/parisc/kernel/vdso64/Makefile index a30f5ec5eb4b..f3d6045793f4 100644 --- a/arch/parisc/kernel/vdso64/Makefile +++ b/arch/parisc/kernel/vdso64/Makefile @@ -26,7 +26,7 @@ $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so FORCE # Force dependency (incbin is bad) # link rule for the .so file, .lds has to be first -$(obj)/vdso64.so: $(src)/vdso64.lds $(obj-vdso64) $(VDSO_LIBGCC) +$(obj)/vdso64.so: $(src)/vdso64.lds $(obj-vdso64) $(VDSO_LIBGCC) FORCE $(call if_changed,vdso64ld) # assembly rules for the .S files @@ -35,7 +35,7 @@ $(obj-vdso64): %.o: %.S FORCE # actual build commands quiet_cmd_vdso64ld = VDSO64L $@ - cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ + cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $(filter-out FORCE, $^) -o $@ quiet_cmd_vdso64as = VDSO64A $@ cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<