Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2000614ybl; Thu, 9 Jan 2020 05:19:39 -0800 (PST) X-Google-Smtp-Source: APXvYqxC02VNhpHNpmnllA5OTya5Q6icQFk9ibYe23Q2YA/1+knX8QXlngshiU1s/Rr6gYHM8DzQ X-Received: by 2002:aca:a849:: with SMTP id r70mr3166968oie.28.1578575979022; Thu, 09 Jan 2020 05:19:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578575979; cv=none; d=google.com; s=arc-20160816; b=XE+FwwwF6GReIzVWkp6+sU832+ijaGj3sCbcs4Yl+YCje1X54kA2ymN2QQVAq9WJji zgJ28njI687qukabkn4Ar8igf4q16cBJxmGhLFbavNmKKFSbJCX83KAfr5hFr08xM6A0 p6f9pNRiQKM2wvQzdnIoulp9yxT9taumDugt70Le57tubgsyNkDgN8h6YNycnt5eiqh+ ldVMrl/te2QdUuPNHPVa3qxquWc/W6lMMb0Spm91wQAWfZ5n79xebQd+fRkPDbsJ8zxq oBZ5pqljSgBB7W7eklZfMRE7EL8T1o/xfA4hubp5x6iDi35sRhBCGgpA3kqjYYQLX9Pr VUOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=tjRemsaLia0ia921QWvHcwvhhTAwji1dVJGd5HJLvnU=; b=BaJQdvQ8VIJQeqr3dP9CP4vvNvoGmZSXk9JfFgZVaUeuUFxCMVDkD/5TxCvfB/dXvo CIeHveftjbZoxfB677sS/YKQjQjifR1D/0EXzSYsFPkHRtZEz+7vycMwMXa9FwlhZD1k drm0Od15+EzV3myfgHvOTF30+EDYfsg4DoMdH+UHLbbpNNsB4Tv8g6KG9WgtOCDtqUKJ 8IiahowcF4G+NJ53Bw6HJBeflnvurwx8mcnUK5KHNGvRSWygZEzgv/jvBJROY3xTAPWJ bNCiafl2y9DYsr+3Fjof2jpMYX0GiwDumZU4Uid6WRjoaRxslmZRhMZKg86ASw8fFxGz kHmA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j9si3650920otq.317.2020.01.09.05.19.26; Thu, 09 Jan 2020 05:19:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731061AbgAIMei (ORCPT + 99 others); Thu, 9 Jan 2020 07:34:38 -0500 Received: from mx2.suse.de ([195.135.220.15]:38020 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729485AbgAIMeK (ORCPT ); Thu, 9 Jan 2020 07:34:10 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 44771B220A; Thu, 9 Jan 2020 12:34:05 +0000 (UTC) From: Thomas Bogendoerfer To: Paul Burton Cc: Ralf Baechle , James Hogan , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/14] MIPS: SGI-IP27: move IP27 specific macro to IP27 specific header file Date: Thu, 9 Jan 2020 13:33:42 +0100 Message-Id: <20200109123353.5656-6-tbogendoerfer@suse.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200109123353.5656-1-tbogendoerfer@suse.de> References: <20200109123353.5656-1-tbogendoerfer@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Extracting node id from HUB register is specific to IP27 alias SN0. Move the macro definition to a SN0 header file. Signed-off-by: Thomas Bogendoerfer --- arch/mips/include/asm/mach-ip27/kernel-entry-init.h | 10 ---------- arch/mips/include/asm/sn/sn0/hub.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/mips/include/asm/mach-ip27/kernel-entry-init.h b/arch/mips/include/asm/mach-ip27/kernel-entry-init.h index ef31d9fcf806..3e54f605a70b 100644 --- a/arch/mips/include/asm/mach-ip27/kernel-entry-init.h +++ b/arch/mips/include/asm/mach-ip27/kernel-entry-init.h @@ -13,16 +13,6 @@ #include #include -/* - * Returns the local nasid into res. - */ - .macro GET_NASID_ASM res - dli \res, LOCAL_HUB_ADDR(NI_STATUS_REV_ID) - ld \res, (\res) - and \res, NSRI_NODEID_MASK - dsrl \res, NSRI_NODEID_SHFT - .endm - /* * TLB bits */ diff --git a/arch/mips/include/asm/sn/sn0/hub.h b/arch/mips/include/asm/sn/sn0/hub.h index d78dd76d5dcf..82cadd785b9c 100644 --- a/arch/mips/include/asm/sn/sn0/hub.h +++ b/arch/mips/include/asm/sn/sn0/hub.h @@ -37,4 +37,16 @@ #define UATTR_MSPEC 2 #define UATTR_UNCAC 3 +#ifdef __ASSEMBLY__ +/* + * Returns the local nasid into res. + */ + .macro GET_NASID_ASM res + dli \res, LOCAL_HUB_ADDR(NI_STATUS_REV_ID) + ld \res, (\res) + and \res, NSRI_NODEID_MASK + dsrl \res, NSRI_NODEID_SHFT + .endm +#endif + #endif /* _ASM_SN_SN0_HUB_H */ -- 2.24.1