From patchwork Wed Aug 7 06:24:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1143282 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 463M1Q6SwZz9sBF for ; Wed, 7 Aug 2019 16:24:58 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="L6kqRong"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 463M1Q51zbzDqyc for ; Wed, 7 Aug 2019 16:24:58 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::644; helo=mail-pl1-x644.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="L6kqRong"; dkim-atps=neutral Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 463M1J3Pb0zDqwp for ; Wed, 7 Aug 2019 16:24:51 +1000 (AEST) Received: by mail-pl1-x644.google.com with SMTP id m9so38976255pls.8 for ; Tue, 06 Aug 2019 23:24:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=m+AEj9PhkMKQEB/Lj3/It2yFMj8Ot2Zkk9Q3a3ZIvmc=; b=L6kqRong6miV6lBLGHYb770br1BIAgSqanGtxvf5g+iDbvMDg6dUSH0tbslV2TzW7E geBC8SWzzZEbHkca/qqAAXvg0xZf6iet2jENCTJYWHPmivfbiamNKNPDkVLv7OHUf804 +Pq4vbx0Fhihrj3q5CDl91bF6OCsC8OdfgqonRHAB+HBXjuB/JdGh543q/mEmFQ+PHr7 p7iR0qu1h3cgpuPgKVyqTKYCI8zaUTJjG0ve4HIG+0YcO//+Q06fkJi3biYvbrNJawfF 3lcxo9bmdoKLPnZq3KM3QJiyBvnP0LoU63Ysu9rQK5frZc+OHpHPxpOgYTshq61KhhXN ZKHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=m+AEj9PhkMKQEB/Lj3/It2yFMj8Ot2Zkk9Q3a3ZIvmc=; b=GtP2SuCzw0pMEvZcRtN4aBNAOh8JWG+4z04uVbHmKmX+/6xzXJW1123nTFksqbfhVj rvn2w2JvqP2QjfwKRTFY0gc459U/wRi2htVPOheDFMEmLPqU7XEwpOrueQUsJYECdKd1 s7MwFzK0s8u38pYmji0lrRDuVXBVbKnUgDxHiNk5vz7JI9IKaDj03kUle6sxk0qjXa8r xUxfc90RASfy5QuWFbcjLejx9DWtsQQpNjuzYg1TJvRy8+6ggfqeWgrsA3E8gb5wRQvb F+Ain8x/bXzMTTQtPa9fsA/HLkRDXWx7lAm7Ibe8UoSuFl3EdfWkEn2TPixjFQ10M7Yh ZtSA== X-Gm-Message-State: APjAAAUM2yDBFA01eUW1GlZEE3Me66IrkRib9QBtiJFiberyWSa+ywnB 1B7TzTQx5cTDMznIQTgE5282OuR0 X-Google-Smtp-Source: APXvYqx63VAG6MI/YS+VCpz65+puYJV8Lerk+0NERN3co49L3GoXDykG7wm8235isEQSYa5TFARVSw== X-Received: by 2002:a17:902:8b88:: with SMTP id ay8mr6464283plb.139.1565159088094; Tue, 06 Aug 2019 23:24:48 -0700 (PDT) Received: from wafer.ozlabs.ibm.com.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id n98sm21573054pjc.26.2019.08.06.23.24.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 06 Aug 2019 23:24:47 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Wed, 7 Aug 2019 16:24:33 +1000 Message-Id: <20190807062435.19780-1-oohall@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Skiboot] [PATCH 1/3] include/xscom: Remove duplicate p8 definitions X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Duplicates of what's already in xscom-p8-regs.h Signed-off-by: Oliver O'Halloran --- include/xscom.h | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/include/xscom.h b/include/xscom.h index 1f89ba9bbb4e..2be643409e68 100644 --- a/include/xscom.h +++ b/include/xscom.h @@ -136,46 +136,6 @@ #define EC_PPM_SPECIAL_WKUP_OCC 0x010C #define EC_PPM_SPECIAL_WKUP_HYP 0x010D -/************* XXXX Move these P8 only registers elswhere !!! ****************/ - -/* Per core power mgt registers */ -#define PM_OHA_MODE_REG 0x1002000D -#define L2_FIR_ACTION1 0x10012807 - -/* EX slave per-core power mgt slave regisers */ -#define EX_PM_GP0 0x0100 -#define EX_PM_GP1 0x0103 -#define EX_PM_CLEAR_GP1 0x0104 /* AND SCOM */ -#define EX_PM_SET_GP1 0x0105 /* OR SCOM */ -#define EX_PM_SPECIAL_WAKEUP_FSP 0x010B -#define EX_PM_SPECIAL_WAKEUP_OCC 0x010C -#define EX_PM_SPECIAL_WAKEUP_PHYP 0x010D -#define EX_PM_IDLE_STATE_HISTORY_PHYP 0x0110 -#define EX_PM_IDLE_STATE_HISTORY_FSP 0x0111 -#define EX_PM_IDLE_STATE_HISTORY_OCC 0x0112 -#define EX_PM_IDLE_STATE_HISTORY_PERF 0x0113 -#define EX_PM_CORE_PFET_VRET 0x0130 -#define EX_PM_CORE_ECO_VRET 0x0150 -#define EX_PM_PPMSR 0x0153 -#define EX_PM_PPMCR 0x0159 - -/* Power mgt bits in GP0 */ -#define EX_PM_GP0_SPECIAL_WAKEUP_DONE PPC_BIT(31) - -/* Power mgt settings in GP1 */ -#define EX_PM_SETUP_GP1_FAST_SLEEP 0xD800000000000000ULL -#define EX_PM_SETUP_GP1_DEEP_SLEEP 0x2400000000000000ULL -#define EX_PM_SETUP_GP1_FAST_SLEEP_DEEP_WINKLE 0xC400000000000000ULL -#define EX_PM_GP1_SLEEP_WINKLE_MASK 0xFC00000000000000ULL -#define EX_PM_SETUP_GP1_PM_SPR_OVERRIDE_EN 0x0010000000000000ULL -#define EX_PM_SETUP_GP1_DPLL_FREQ_OVERRIDE_EN 0x0020000000000000ULL - -/* Fields in history regs */ -#define EX_PM_IDLE_ST_HIST_PM_STATE_MASK PPC_BITMASK(0, 2) -#define EX_PM_IDLE_ST_HIST_PM_STATE_LSH PPC_BITLSHIFT(2) - -/***************************************************************************/ - /* Definitions relating to indirect XSCOMs shared with centaur */ #define XSCOM_ADDR_IND_FLAG PPC_BIT(0) #define XSCOM_ADDR_IND_ADDR PPC_BITMASK(12,31)