From patchwork Wed Sep 10 10:20:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 37192 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2C25220293 for ; Wed, 10 Sep 2014 10:21:28 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id rd3sf33479388pab.2 for ; Wed, 10 Sep 2014 03:21:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=DKi5gpmM2E2TGQndj1QYK2T8OX0D5qpiBRqejNydZeM=; b=PDkglSmiG2P0lwcIAfAjDtYz0OpbnS9NJ6x0FAEXdv7IY9oUpQYRJF3N0yr8yN7tIC tRFweJrOVjiAQ1YzZdftw5dScRmJbA+zlVU9IixFS5jDtHTPxN3qlwCapsSlgQq3k1wL h4H04G8zwiN7CyDYqxhRTwtIqYtRB3hZ98DaeEMLr4Vat42+ppW2GA1xbyoYPP7uXLr+ fncfz1Tfms9fjEViaghhmCfdCzHHj91axn2OZu6n/K9m0oXtCuPDcPkFYJYQ+h0wrFlz g6x515NYDQgbZ2ng+tZ+VxsOrAaGEXdG/d3I3vvai4v4+DDl/AtSrjNEJYJHvMn0MYcm 8euA== X-Gm-Message-State: ALoCoQnZ///HHLBySi/yeioz+9FUb3JB9fQml5ATx5/0/DkvkSOVWcImD1rwAOq2MoM1qNC2t7J9 X-Received: by 10.66.66.3 with SMTP id b3mr24198808pat.6.1410344487271; Wed, 10 Sep 2014 03:21:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.9 with SMTP id o9ls2560301qgd.47.gmail; Wed, 10 Sep 2014 03:21:27 -0700 (PDT) X-Received: by 10.220.116.196 with SMTP id n4mr34975792vcq.6.1410344487093; Wed, 10 Sep 2014 03:21:27 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id 20si6178197vcd.22.2014.09.10.03.21.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Sep 2014 03:21:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id hy10so3923253vcb.5 for ; Wed, 10 Sep 2014 03:21:27 -0700 (PDT) X-Received: by 10.220.46.5 with SMTP id h5mr5811681vcf.55.1410344487006; Wed, 10 Sep 2014 03:21:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp414684vcb; Wed, 10 Sep 2014 03:21:26 -0700 (PDT) X-Received: by 10.66.102.7 with SMTP id fk7mr63669880pab.127.1410344485964; Wed, 10 Sep 2014 03:21:25 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d8si27146506pat.120.2014.09.10.03.21.24 for ; Wed, 10 Sep 2014 03:21:25 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752564AbaIJKVW (ORCPT + 27 others); Wed, 10 Sep 2014 06:21:22 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:60475 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752528AbaIJKVS (ORCPT ); Wed, 10 Sep 2014 06:21:18 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s8AAKeP7009633; Wed, 10 Sep 2014 05:20:40 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8AAKe1V029939; Wed, 10 Sep 2014 05:20:40 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Wed, 10 Sep 2014 05:20:40 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8AAKdxu024164; Wed, 10 Sep 2014 05:20:39 -0500 From: Nishanth Menon To: Tony Lindgren CC: Kristian Otnes , Peter Ujfalusi , Santosh Shilimkar , , , , Nishanth Menon Subject: [PATCH] bus: omap_l3_noc: Fix connID for OMAP4 Date: Wed, 10 Sep 2014 05:20:27 -0500 Message-ID: <1410344427-26006-1-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: nm@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit d4d8819e205854c ("bus: omap_l3_noc: fix masterid detection") did the right thing in dropping the LSB 2 bits which is not part of the ConnID for NTTP master address. However, as part of that change, we should also have ensured that existing list of OMAP4 connID codes are also shifted by 2 bits to ensure that connIDs map to "Table 13-18. ConnID Values" as provided in Technical Reference Manuals for OMAP4430(Rev AP, April 2014, SWPU220AP) and OMAP4460(Rev AB, April 2014, SWPU234AB) Fixes: d4d8819e205854c ("bus: omap_l3_noc: fix masterid detection") Reported-by: Kristian Otnes Signed-off-by: Nishanth Menon --- Based on v3.17-rc1 - but might be 3.17 rc material Quick links (seems to work on firefox): 4430: http://www.ti.com/lit/ug/swpu231ap/swpu231ap.pdf#page=3030&zoom=auto,0,699.5 4460: http://www.ti.com/lit/ug/swpu235ab/swpu235ab.pdf#page=3073&zoom=auto,0,699.5 NOTE: there are a few more cleanup patches that can follow these.. will leave those out for now. drivers/bus/omap_l3_noc.h | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/bus/omap_l3_noc.h b/drivers/bus/omap_l3_noc.h index 551e010..9525458 100644 --- a/drivers/bus/omap_l3_noc.h +++ b/drivers/bus/omap_l3_noc.h @@ -188,31 +188,31 @@ static struct l3_flagmux_data omap_l3_flagmux_clk3 = { }; static struct l3_masters_data omap_l3_masters[] = { - { 0x0 , "MPU"}, - { 0x10, "CS_ADP"}, - { 0x14, "xxx"}, - { 0x20, "DSP"}, - { 0x30, "IVAHD"}, - { 0x40, "ISS"}, - { 0x44, "DucatiM3"}, - { 0x48, "FaceDetect"}, - { 0x50, "SDMA_Rd"}, - { 0x54, "SDMA_Wr"}, - { 0x58, "xxx"}, - { 0x5C, "xxx"}, - { 0x60, "SGX"}, - { 0x70, "DSS"}, - { 0x80, "C2C"}, - { 0x88, "xxx"}, - { 0x8C, "xxx"}, - { 0x90, "HSI"}, - { 0xA0, "MMC1"}, - { 0xA4, "MMC2"}, - { 0xA8, "MMC6"}, - { 0xB0, "UNIPRO1"}, - { 0xC0, "USBHOSTHS"}, - { 0xC4, "USBOTGHS"}, - { 0xC8, "USBHOSTFS"} + { 0x00, "MPU"}, + { 0x04, "CS_ADP"}, + { 0x05, "xxx"}, + { 0x08, "DSP"}, + { 0x0C, "IVAHD"}, + { 0x10, "ISS"}, + { 0x11, "DucatiM3"}, + { 0x12, "FaceDetect"}, + { 0x14, "SDMA_Rd"}, + { 0x15, "SDMA_Wr"}, + { 0x16, "xxx"}, + { 0x17, "xxx"}, + { 0x18, "SGX"}, + { 0x1C, "DSS"}, + { 0x20, "C2C"}, + { 0x22, "xxx"}, + { 0x23, "xxx"}, + { 0x24, "HSI"}, + { 0x28, "MMC1"}, + { 0x29, "MMC2"}, + { 0x2A, "MMC6"}, + { 0x2C, "UNIPRO1"}, + { 0x30, "USBHOSTHS"}, + { 0x31, "USBOTGHS"}, + { 0x32, "USBHOSTFS"} }; static struct l3_flagmux_data *omap_l3_flagmux[] = {