From patchwork Tue Feb 4 06:05:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: PranavkumarSawargaonkar X-Patchwork-Id: 24081 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EAED320445 for ; Tue, 4 Feb 2014 06:05:48 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wo20sf32217429obc.11 for ; Mon, 03 Feb 2014 22:05:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=8CgLRhxGK4jczJ70UuNRQgAr1z6JIuB/ep5hiK440Ko=; b=TUGMYHR8TMt36pdf9K7IIquB59TgjbhuPFZNU0mOpXOFkS0sx4l0R00mbRbRkyzQPR riok+JnqOMuDB4BvDF1meyq2GPjNw25unorunRYTZQAUCH0dynXvheGilx9b2XkpMHdd hF/t8CIabaOFG91s1/ATE7u8QV1NoL5fYk1rbBaBBkselDp1xJgHSIFIomRdJ//JBOPi PGEGAAfBdzXD/11aE+RR3vYWh+5bVALZ3RL6GeWZykkHxyOwcg6dT3JgtwGwiy2dj+dW +hUfJllX9mtjl6oRB73yu9q4zvLBk8eWBgeslHmDeI2u3S4r6e8tyTz6GXXY32DJ4cBO S1NQ== X-Gm-Message-State: ALoCoQl+4Y+AHOvJJ+ZRe46orAYkXkTGH00AA2k/rToY0l36EZ3cOV9i50tFL3VoNYPjqPBOqIkj X-Received: by 10.182.24.5 with SMTP id q5mr15307310obf.23.1391493947783; Mon, 03 Feb 2014 22:05:47 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.215 with SMTP id 81ls2138943qgr.14.gmail; Mon, 03 Feb 2014 22:05:47 -0800 (PST) X-Received: by 10.58.86.230 with SMTP id s6mr31327991vez.16.1391493947710; Mon, 03 Feb 2014 22:05:47 -0800 (PST) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by mx.google.com with ESMTPS id qt5si7731026vcb.98.2014.02.03.22.05.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Feb 2014 22:05:47 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.49; Received: by mail-vb0-f49.google.com with SMTP id x14so5332488vbb.22 for ; Mon, 03 Feb 2014 22:05:47 -0800 (PST) X-Received: by 10.220.58.202 with SMTP id i10mr4701452vch.23.1391493947619; Mon, 03 Feb 2014 22:05:47 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp210375vcz; Mon, 3 Feb 2014 22:05:47 -0800 (PST) X-Received: by 10.66.187.11 with SMTP id fo11mr42124300pac.47.1391493946572; Mon, 03 Feb 2014 22:05:46 -0800 (PST) Received: from mail-pd0-f171.google.com (mail-pd0-f171.google.com [209.85.192.171]) by mx.google.com with ESMTPS id ek3si23189171pbd.325.2014.02.03.22.05.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Feb 2014 22:05:46 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.171 is neither permitted nor denied by best guess record for domain of pranavkumar@linaro.org) client-ip=209.85.192.171; Received: by mail-pd0-f171.google.com with SMTP id g10so7776821pdj.16 for ; Mon, 03 Feb 2014 22:05:46 -0800 (PST) X-Received: by 10.68.196.195 with SMTP id io3mr42535544pbc.6.1391493946020; Mon, 03 Feb 2014 22:05:46 -0800 (PST) Received: from pnqlab006.amcc.com ([182.73.239.130]) by mx.google.com with ESMTPSA id ja8sm21837262pbd.3.2014.02.03.22.05.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Feb 2014 22:05:45 -0800 (PST) From: Pranavkumar Sawargaonkar To: xen-devel@lists.xen.org Cc: ian.campbell@citrix.com, stefano.stabellini@citrix.com, patches@apm.com, patches@linaro.org, Pranavkumar Sawargaonkar , Anup Patel Subject: [PATCH] xen: arm: platforms: Remove determining reset specific values from dts for XGENE. Date: Tue, 4 Feb 2014 11:35:32 +0530 Message-Id: <1391493932-31268-1-git-send-email-pranavkumar@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pranavkumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch removes reading reset specific values (address, size and mask) from dts and uses values defined in the code now. This is because currently xgene reset driver (submitted in linux) is going through a change (which is not yet accepted), this new driver has a new type of dts bindings for reset. Hence till linux driver comes to some conclusion, we will use hardcoded values instead of reading from dts so that xen code will not break due to the linux transition. Ref: http://lists.xen.org/archives/html/xen-devel/2014-01/msg02256.html http://www.gossamer-threads.com/lists/linux/kernel/1845585 Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: Anup Patel Acked-by: Ian Campbell --- xen/arch/arm/platforms/xgene-storm.c | 43 +++++++++------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 4fc185b..1da9b36 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -25,6 +25,11 @@ #include #include +/* XGENE RESET Specific defines */ +#define XGENE_RESET_ADDR 0x17000014UL +#define XGENE_RESET_SIZE 0x100 +#define XGENE_RESET_MASK 0x1 + /* Variables to save reset address of soc during platform initialization. */ static u64 reset_addr, reset_size; static u32 reset_mask; @@ -141,38 +146,12 @@ static void xgene_storm_reset(void) static int xgene_storm_init(void) { - static const struct dt_device_match reset_ids[] __initconst = - { - DT_MATCH_COMPATIBLE("apm,xgene-reboot"), - {}, - }; - struct dt_device_node *dev; - int res; - - dev = dt_find_matching_node(NULL, reset_ids); - if ( !dev ) - { - printk("XGENE: Unable to find a compatible reset node in the device tree"); - return 0; - } - - dt_device_set_used_by(dev, DOMID_XEN); - - /* Retrieve base address and size */ - res = dt_device_get_address(dev, 0, &reset_addr, &reset_size); - if ( res ) - { - printk("XGENE: Unable to retrieve the base address for reset\n"); - return 0; - } - - /* Get reset mask */ - res = dt_property_read_u32(dev, "mask", &reset_mask); - if ( !res ) - { - printk("XGENE: Unable to retrieve the reset mask\n"); - return 0; - } + /* TBD: Once Linux side device tree bindings are finalized retrieve + * these values from dts. + */ + reset_addr = XGENE_RESET_ADDR; + reset_size = XGENE_RESET_SIZE; + reset_mask = XGENE_RESET_MASK; reset_vals_valid = true; return 0;