Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp1445688ybm; Thu, 23 May 2019 00:52:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqyrG4GM4fhw7Hb5vebev8lJXwu40pI0Y98aU9yOcocFk3pzElAddOZQIn0R1SYVHbqYQXjg X-Received: by 2002:a17:902:56a:: with SMTP id 97mr57503733plf.20.1558597927750; Thu, 23 May 2019 00:52:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558597927; cv=none; d=google.com; s=arc-20160816; b=WprmPENTuBzjrfR3xF/dRK/PIJI+886QpUDAO860YRh/wK0W9CatIbOF7s7GemSSRW zJ1n9uC41+Lb9PdmUW1jx9sF9tgmO58WrXbALyOZhYUcc7mxVGd7oSorfW4+sGQQtt+p clU9ef+vgBMzsY3xshkD2YRrVByKUOwWJWpBKhbf/up2uAPQRemu5a1vramdptb9N5NM V0GyVuEUO0RYCudBvhybCE6k6lVShsSgs68nadetUwPSSzY1/o5w6nhFyy4Bcvya85Xa xK4L2RSiuOviKsC402L/5N1j1GSnffz0tY2V8A1NwbLBGY2dDOiOCtr/qOhvecuttjMb nXrA== 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 :dkim-signature; bh=wWU2/ZcIvaZLxR1lu0OL6bskmNcVChQrVDukB7aBvq0=; b=tJP6n8JaMJUfXNRqo4kRjRkXByGOBv3ZR0uWHimRgusy2UK5Bt3tb3s32DDXT7ABsj Jiu2fvyQc4u+Os6HQ/I6ej6kvllAvU8LWUGdyZpwXk41cvtMxGauxxNTXEBI8HzpYnlK JfcSuND5ZOvwI5ZIpEH7e3Kwwzy9CRKaj73s2SzOhE6MScPCB6GO+18F+r3PAESGIBln 94cSQ34eIsOhjIV9XYwCDsjMltsYZY/H0ZXD90Jb5ONt9oaa68+zLKtI/tpk1u8XHJGx y8MWf23XiUP5M5YBH/l1Pn51ELc9hthVuR8pEF3W9b6BujzXLjaCaNhyQVm4qA/bNabe wSwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=PRlxrwyf; 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 t136si31490178pfc.144.2019.05.23.00.51.52; Thu, 23 May 2019 00:52:07 -0700 (PDT) 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; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=PRlxrwyf; 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 S1730165AbfEWHts (ORCPT + 99 others); Thu, 23 May 2019 03:49:48 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:35864 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726846AbfEWHtr (ORCPT ); Thu, 23 May 2019 03:49:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=wWU2/ZcIvaZLxR1lu0OL6bskmNcVChQrVDukB7aBvq0=; b=PRlxrwyf03cYYF5YnQkZUY9nqI S/VqKVe4MWCQqKC4H/T1THKyp/fQAA3p+rdte7nijCwajE+AX/15mkMTawApdO/avsh5Sn8/TBsJU vhgGzTOy5d7sPj3huOy83wcYCOCz5A5lFAjNtKpOiZU/PizFcAdJEz9sfovtlNWQZLxj4SF/Ab2/D Nli9Evvpwh+WU319kdcoYPMKUIYaW1LGY1pI0VWOgdYHjqk1GhpOWPMzKX5am0cnHdFDL/N2lwepY uzZ/EvKkOUQESfpYsrc/VkW9hK1CaQELzuU6vSVMP3BZBPv8Ec8rO8z4wP2PQczp3MwWJAYCL0qtp TC/8YxXg==; Received: from 213-225-10-46.nat.highway.a1.net ([213.225.10.46] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1hTiTp-00043w-4v; Thu, 23 May 2019 07:49:37 +0000 From: Christoph Hellwig To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] powerpc/powernv: remove the unused vas_win_paste_addr and vas_win_id functions Date: Thu, 23 May 2019 09:49:24 +0200 Message-Id: <20190523074924.19659-5-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523074924.19659-1-hch@lst.de> References: <20190523074924.19659-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These two function have never been used since they were added to the kernel. Signed-off-by: Christoph Hellwig --- arch/powerpc/include/asm/vas.h | 10 ---------- arch/powerpc/platforms/powernv/vas-window.c | 19 ------------------- arch/powerpc/platforms/powernv/vas.h | 20 -------------------- 3 files changed, 49 deletions(-) diff --git a/arch/powerpc/include/asm/vas.h b/arch/powerpc/include/asm/vas.h index 771456227496..9b5b7261df7b 100644 --- a/arch/powerpc/include/asm/vas.h +++ b/arch/powerpc/include/asm/vas.h @@ -167,14 +167,4 @@ int vas_copy_crb(void *crb, int offset); */ int vas_paste_crb(struct vas_window *win, int offset, bool re); -/* - * Return a system-wide unique id for the VAS window @win. - */ -extern u32 vas_win_id(struct vas_window *win); - -/* - * Return the power bus paste address associated with @win so the caller - * can map that address into their address space. - */ -extern u64 vas_win_paste_addr(struct vas_window *win); #endif /* __ASM_POWERPC_VAS_H */ diff --git a/arch/powerpc/platforms/powernv/vas-window.c b/arch/powerpc/platforms/powernv/vas-window.c index e59e0e60e5b5..e48c44cb3a16 100644 --- a/arch/powerpc/platforms/powernv/vas-window.c +++ b/arch/powerpc/platforms/powernv/vas-window.c @@ -44,16 +44,6 @@ static void compute_paste_address(struct vas_window *window, u64 *addr, int *len pr_debug("Txwin #%d: Paste addr 0x%llx\n", winid, *addr); } -u64 vas_win_paste_addr(struct vas_window *win) -{ - u64 addr; - - compute_paste_address(win, &addr, NULL); - - return addr; -} -EXPORT_SYMBOL(vas_win_paste_addr); - static inline void get_hvwc_mmio_bar(struct vas_window *window, u64 *start, int *len) { @@ -1268,12 +1258,3 @@ int vas_win_close(struct vas_window *window) return 0; } EXPORT_SYMBOL_GPL(vas_win_close); - -/* - * Return a system-wide unique window id for the window @win. - */ -u32 vas_win_id(struct vas_window *win) -{ - return encode_pswid(win->vinst->vas_id, win->winid); -} -EXPORT_SYMBOL_GPL(vas_win_id); diff --git a/arch/powerpc/platforms/powernv/vas.h b/arch/powerpc/platforms/powernv/vas.h index f5493dbdd7ff..551affaddd59 100644 --- a/arch/powerpc/platforms/powernv/vas.h +++ b/arch/powerpc/platforms/powernv/vas.h @@ -448,26 +448,6 @@ static inline u64 read_hvwc_reg(struct vas_window *win, return in_be64(win->hvwc_map+reg); } -/* - * Encode/decode the Partition Send Window ID (PSWID) for a window in - * a way that we can uniquely identify any window in the system. i.e. - * we should be able to locate the 'struct vas_window' given the PSWID. - * - * Bits Usage - * 0:7 VAS id (8 bits) - * 8:15 Unused, 0 (3 bits) - * 16:31 Window id (16 bits) - */ -static inline u32 encode_pswid(int vasid, int winid) -{ - u32 pswid = 0; - - pswid |= vasid << (31 - 7); - pswid |= winid; - - return pswid; -} - static inline void decode_pswid(u32 pswid, int *vasid, int *winid) { if (vasid) -- 2.20.1