From patchwork Mon May 30 02:14:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 9140139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 84F3F60755 for ; Mon, 30 May 2016 02:16:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74E9227BEF for ; Mon, 30 May 2016 02:16:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6975928185; Mon, 30 May 2016 02:16:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ED36427BEF for ; Mon, 30 May 2016 02:16:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b7CjV-0001H4-UP; Mon, 30 May 2016 02:15:09 +0000 Received: from eu-smtp-delivery-143.mimecast.com ([207.82.80.143]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b7CjS-0008W3-Qg for linux-arm-kernel@lists.infradead.org; Mon, 30 May 2016 02:15:07 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp0243.outbound.protection.outlook.com [213.199.154.243]) (Using TLS) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-46-dz2ibQvUQduWElc8Wc6OuA-1; Mon, 30 May 2016 03:14:44 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=tG6xoliwb9TCKJHQWhO821SqhwP6NOMcp+I72O36cTA=; b=aDpRFdq15kFDC/8vZE9izX6K54vnJjcMkfA9QO3wKYp0KleX8ICXBwVXAjmmbw84uYq5cWNm3RWf49QQvJWlVuZ+o/gCWGFN4gyi3RKohniuyx1ACV4e+sClbzvKOND5PgGXHtxL3mzllyTSYoC1a0arhnO57ecyUgehsOd7xJU= Received: from AM4PR08CA0036.eurprd08.prod.outlook.com (10.166.127.46) by AM4PR08MB0963.eurprd08.prod.outlook.com (10.166.133.149) with Microsoft SMTP Server (TLS) id 15.1.506.9; Mon, 30 May 2016 02:14:41 +0000 Received: from AM1FFO11FD001.protection.gbl (2a01:111:f400:7e00::143) by AM4PR08CA0036.outlook.office365.com (2603:10a6:200:1a::46) with Microsoft SMTP Server (TLS) id 15.1.506.9 via Frontend Transport; Mon, 30 May 2016 02:14:42 +0000 Received: from nebula.arm.com (217.140.96.140) by AM1FFO11FD001.mail.protection.outlook.com (10.174.64.83) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Mon, 30 May 2016 02:14:41 +0000 Received: from sha-win-210.asiapac.arm.com (10.1.2.79) by mail.arm.com (10.1.105.66) with Microsoft SMTP Server id 14.3.279.2; Mon, 30 May 2016 03:14:39 +0100 From: Huang Shijie To: Subject: [PATCH 1/3] arm64: move the PTE_VALID to pgtable-hwdef.h Date: Mon, 30 May 2016 10:14:26 +0800 Message-ID: <1464574468-22700-1-git-send-email-shijie.huang@arm.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:217.140.96.140; IPV:CAL; SCL:-1; CTRY:GB; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(199003)(189002)(47776003)(48376002)(36756003)(50986999)(1220700001)(2906002)(4326007)(189998001)(5003940100001)(106466001)(110136002)(586003)(92566002)(87936001)(229853001)(5003600100002)(77096005)(19580405001)(19580395003)(8936002)(86362001)(2351001)(8676002)(5008740100001)(104016004)(6806005)(450100001)(33646002)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR08MB0963; H:nebula.arm.com; FPR:; SPF:Pass; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM1FFO11FD001; 1:2wfg+ch/OJ7PfIA7aNVxXjFcEWNw9ojwWXFIWIrFomFdpVO7R1DlxV3Pi5P/SOXoT+g8GF+WdcwfW8zP+iH6v1bx5RgMN8LgrEurpDkYBYfkuXjajGJiYR/msWaNh6EBSJ1PLBXLgrosXnj2obu7in286UxpwJ85qqBtfkWIpaDl5x8IjhD9EyrQPLW2zltvSxvkgqxUDyzk7E0s07CUK71d2++cSEzipB1SbgZUjTL1bbcsEm74BZ8atXudn4Gn5URhD8KSZfT6ueieDvc7jmWBoEUCgJdwN65/VuQWG/+JZUWb2CVfR7ycU0xvgEcZR9u2pIjKi9IMAemfONuCCRoUJU0j/cIa7g4oZZA59CZ0wg4mMFh/zaIhZUl5/fFEYjVCIyMVdPmvC4vKXg/nrUu7rwL2PDNp89mgtLjnjcx24u25EeGzKY83j2Hxx14ztQoGHjfiF99PrtchwaGahzDFDIuuNQ+D0pUO6ryDNWC80OTvY0LkdWaYV6CES2jaPr8mp/o0fzHs3wNyRgweQvvMwT5UVMhJxmIjE2O+zZQ= X-MS-Office365-Filtering-Correlation-Id: 0f9d0d87-9ee6-45c9-9c45-08d388302931 X-Microsoft-Exchange-Diagnostics: 1; AM4PR08MB0963; 2:/qg9W4gdEhOVh2kTt6mh+Z3SP+oM2pcaN1Hap5igXSbFhoQ9TO0rIuV4XycnjZW+5ms1rnxCf/CURXPxcnIqQTY9kiQQmdjCsDm/ZXl0MhpMrSa9lK5+a11dou69AwKb5xZPMFIMY5eOFu+LjS5LVLC6Uisng6b9zili428UvEme/hM9FhdfW0GHwpShVEjn; 3:IysZ0IQ9qIg+a8z+GIu3aUirrWm3aF1AxknAbR8FTwpWc7uCdqtEdWHhKlfu+ybhIJnI4X9yOMPvdBzNLpaep0l9JB2XPzEwvaKQ6I4E5LmIi6lp9WNZCyBteoaUNYqed20gS9igLfYojG9jWpBOWWQrlPkKaWhqcymbSG8vEmQv4wgwIpnzobEbebCn2zCGPv6w7SDwtOx85A2XsLG6u2JLrBX8OLtLLIwwbG5ruGOOMpLgDnD1Wpg8A0I5t3vkZ7zAmIThIZ/bRpuuYDCx6w== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:AM4PR08MB0963; X-Microsoft-Exchange-Diagnostics: 1; AM4PR08MB0963; 25:W8yQugjHNlbGNKwUWL0tvSOx8PeFKL+IMPjhuUJs79uRLMd9cR0rxtquKJlpTAmZW/sue5u1j45xu1Kvb/oOcd4bqsFXWw8ckQm+rhRkkoweksYrw/6E3Y6K7T96hOaUN92MXBFPkN79aMaRxIwBE7Z9IhZcx789gZX09ZTV65kcDw/FC3lRXFSUz2Dh3YV1ScpUlVVCC52i9lzveuhpWDcSoSHgMZr2/9s8HQ4PIIWMCkakfoGrhx94LC5eiiAwcV/MVe0Vt63btyEEjzzICR4CwqD/E9sFo7tXH/ul1xNGiEzuPvI/JL5hpkT3iyWWXVdJ/C9wJOyP761SWUiZl5SO8AtSC+OPw4ItrkQzgorNiA44m1Ik/7Iexej1yyJNyuMQt6lKrVnsD2BpO6mMxnoNWfrugHgf6MgIBN1cBn2nkFnW8uvSblKBh7BhlK3mxBiR7B/r7D4fCkuQ4rtcALrBHa9zPo7TVj2QwUW9jLoy4gtYevH2xUn2OtDJjcnIptZqzi2RYe+OOdo4D73sKwDkUHmnuCjbwLPzHrBQc/LP4SmEIxihroG7DAJ8iThNBfLf1G+qHQrtOI339+pe0qIRCcJSk9kGf0OPnz33ZddC1hLaqHVMnGzDNhmV2DtMKhOgR6HJad9V8H/FP7Ct0Bc3hf1pp5r2YVMEg1IIWrqfaIm+sr2xrLl1y/9klz/5idnk9uFA8vUHZIrmlAq12W03ccwYEf4ckYmcE1CRN+V7YUgFgiY1jUi21SV8+kjW NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; AM4PR08MB0963; 20:56aPuPTjJXhiCdyAdQ/A6mOf3x/A4V6f/JjXCzul9mA1apDnoWzw1tu6gkyS6w92QxhJm/3Lrmg9uM4nBgsCsr/9yOoyHR/VIGKvS3cdyl8ACgffPbLaepuMLVi5a4ERAtX6tGsetF3UIn7YeuO8bHLUzV80GGvvp/S2AivKyVTcLbSo7FA0eaDOnPpnzfGoXQYL7+dzWgRoJYapvxltU4FrQvtO4SC6kNO0yP745nXjeO98Nt9GbuFCLRSnldXY; 4:wwOs0IAWUfk8d8pQR1UiTg5fFfVqP7uDWWBDckUbO4to+FNuH8P8HHS+sryrls1TRiVZOm2DnvwND1Y1p3wxHp+uhLX08NRzXjdQbW9RQi79u9Kd7a6Zf8KvumERMrVL1pVHqBbiD2wlBhqkfE3VkYYxQludwfLxL3Q9WE+zylfX2Y4h9eERcSy9FTs09IC0liZNsp0+7HPZLNm2mKHWSxPnOEVTLUH+J74vCaD5Br7pgqIrW7TfKXNkmbASOpMxVO2XIiBYj4SGhfB4BC1TSGxDIYGQLD/GhDRL2TQl0d4gjLquBhlUwHK7cO4+Tac0F/YBN57fMS3NcQY+Ius7io4SzCx1Ade66jsDfiJWDc4Hn0/JcwjPxpERfBOlITOYNjLBx7Qq1KvsbI0bMpZ5c5d1AUVxzWSeTrJaim0GZ9FBaLBpc7THoEhHA5bXPy+IHsTOhSVuu2F/k1WoaF8ISn6UQ0oKXrgOXPuLDpInYnRhnwsExrzCnQLz4ZAoeHcf X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(13023025)(13013025)(13020025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:AM4PR08MB0963; BCL:0; PCL:0; RULEID:; SRVR:AM4PR08MB0963; X-Forefront-PRVS: 09583628E0 X-Microsoft-Exchange-Diagnostics: 1; AM4PR08MB0963; 23:DOc7LjHpQQUIlkToaKHVlkmjNdKu9ASbwVGjqPwuzndaB8pQW4t4NcUx79YiePy4qNpm+/vpU/Ae3ScoEO0j+icFDz8pFdXeQgFpohIS72TcK71OsnT3ARN6blK92dynRcMxj5/s2VMLWPN+fFB/hTQFytvRdVZ5RGJxm/Rh3fRXFDiOXyXgvOK7ZK6cHS5wZPuHx85gSH1Vj4v5CZOFnFcU2PZZLGhOH6QYtDh59RPN/4441zWtriX3enrLswXQAhDv8wjg080K/xXLAUry1ec2mnOL+PgkH6wmGfpj7nBsNMgLKUFgqkfASbdZvDfvWW3TNYJsFUppzEqnsN//QLYUWLemvfu0oL1T+kMBC+lVhMf4G5s5FTCErRVIIfw8CBAZ/H0haZP1HlGjqRsGu5WglFf6h3ksqixOvOUefvMdNOacSuREVF0h3NEhKNWlkCeh9HqZxnjXUQka6/uC4Y7uWhfe9hB06Zty6Pfg4cySC1jbz7TS8vfeyT+hGKMRxXDZk0t0kWNbWeGXRVoW1PmjWkG1j9rgxz4wh4mpPFV/MwmWEgd357SHyA53k5SmM5SMZKiivHiwNnMxcl2fNMteqaB4544Jkx6ZGHDbdvEu3lHIG7uCHT2LF8pfKTa6Goor20oG6QPdVNNW5MeyGO8gX038MSOblXx1qonkJVAkF51aMpXu1ujzN73Q2Uus3mlayBIlgf2USABvWwk26FXeft08xUQvb+aepPgiWFGzVmnMVaofwAK8ey5IAMxkU6HUYusLUzuQngAUWFBuQ0ycVRhEfR1NMfO9eCpk0zfEwRrX6TC7PQucvlmSoYGXBoGbK0jBUTfZfP3f1A+zDnfMVYyK/wh0GLivhYcfsFfV5VDYYw+lFxpZTPMLJT0NAqpZROIzgfhJBZrkM0dUXIBuuT1RISsr9M3fYtbMiXI= X-Microsoft-Exchange-Diagnostics: 1; AM4PR08MB0963; 5:NfxxGqaFt3W6nj+0T76wTaFGixBoKFMjlmiV2p25qzA2eApkOhQJDjvz1sWU+5aHJ/TTFqLGOJRWAEibN2mDTryhb4eEagDYDFiag2HBQHjyWLnebWpHSTHK+D+ofgP11q8cKmMTsL6QWS8+tWs2RA==; 24:fozir9WVlGc4SutoG7i+Wl9xiB9UtrOXD7Lp2DewMx4SofETUqdtJ2mgKGQltyoYr8aoznUP8jjE/UJ5Sr+V0biq6Jpv9f3eIE2WLFy1ozQ=; 7:aWxepa2BSrfY5lvkCsK21Z0xZ1z7xxy+wxk69xiicVKhcJ6jMaa+OrYcCB8cZEj+N4VOJumM5mHOZURVJ0OLfhxYBZRCjJNgXnd8tlMtWBp8DsE+Hct+bTkiYkv0ao38alJWWIgRikWNCBjnGqB+ue2B2c9A4UjPtM4wYnoH0SjoTh29isH9j2f0/yZKXBDE; 20:+QiXX9gT6jXlw113gvOMyZt6HOoas19U6jJe1i0L4oSu1R7r0nFUroELNrkKa2eo6J6U6bHOPkaX0UH0gDrobhBJKJXCWdeUR/qir3MVRZ6TeFHV+tfAnwFfU96azGrkDW2oZb+jGAGOucbgux/8lVU0QRwJqbnX6SNUd+owUbo= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2016 02:14:41.7800 (UTC) X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[217.140.96.140]; Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB0963 X-MC-Unique: dz2ibQvUQduWElc8Wc6OuA-1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160529_191507_181016_49FD7252 X-CRM114-Status: UNSURE ( 8.29 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, steve.capper@arm.com, will.deacon@arm.com, Huang Shijie , nd@arm.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The PTE_VALID is used to check whether the page descriptor is valid. It's not a software defined PTE bits, such as PTE_WRITE/PTE_DIRTY. So move it to the proper header file: pgtable-hwdef.h. Signed-off-by: Huang Shijie --- arch/arm64/include/asm/pgtable-hwdef.h | 1 + arch/arm64/include/asm/pgtable-prot.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h index 2813748..eeb3269 100644 --- a/arch/arm64/include/asm/pgtable-hwdef.h +++ b/arch/arm64/include/asm/pgtable-hwdef.h @@ -154,6 +154,7 @@ #define PTE_TYPE_MASK (_AT(pteval_t, 3) << 0) #define PTE_TYPE_FAULT (_AT(pteval_t, 0) << 0) #define PTE_TYPE_PAGE (_AT(pteval_t, 3) << 0) +#define PTE_VALID (_AT(pteval_t, 1) << 0) #define PTE_TABLE_BIT (_AT(pteval_t, 1) << 1) #define PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */ #define PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */ diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h index 29fcb33..5ac71f4 100644 --- a/arch/arm64/include/asm/pgtable-prot.h +++ b/arch/arm64/include/asm/pgtable-prot.h @@ -24,7 +24,6 @@ /* * Software defined PTE bits definition. */ -#define PTE_VALID (_AT(pteval_t, 1) << 0) #define PTE_WRITE (PTE_DBM) /* same as DBM (51) */ #define PTE_DIRTY (_AT(pteval_t, 1) << 55) #define PTE_SPECIAL (_AT(pteval_t, 1) << 56)