From patchwork Fri Jan 4 17:49:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10748779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2B7786C5 for ; Fri, 4 Jan 2019 18:38:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C1A528669 for ; Fri, 4 Jan 2019 18:38:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EE5328675; Fri, 4 Jan 2019 18:38:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 90F5528669 for ; Fri, 4 Jan 2019 18:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=t3xbhva58QNmnG4J5zVLkm+6N6wWM1PuogtFVMWbduQ=; b=ICfdtgeTWNsBQ4 AgMjjKwNGQ4Ewg8HCxzSV5hyAvRMm6zeoRvNz3doZJNwGe31HALiEtopkkLdsz0tEjRoPfS85R+2P htUJb4SlUeVfd7X8rgen9vv3pSleq4MIG5JMZSfxoTldHkQU6f4lSSF2bo0clOIuX9jxIyXPS05pP Y5zbLhwMfyFvPPfhrA+UXfvnbw8VLK/4yfba91Oy8s5QYEUXM5hzl5EybwV6IPi3IIRKrHDoNHPba O8qnWKYUlbx6OSd+4xVf4dWHx/USPbSwtucC5hK0Mqsl4njIrbAxs3xcAkMI4BKVBvNN2YzOwNN5K h3zTQBr1Ku7j1jMGfqUg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfUM8-0001Lj-9V; Fri, 04 Jan 2019 18:38:04 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfULe-0000ng-8G for linux-arm-kernel@bombadil.infradead.org; Fri, 04 Jan 2019 18:37:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.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=Ov2inzM6fmFsHxVXZyw47G5jAGapuFYmlo7Z2pYF+A4=; b=dujIBNp5gNSDjQz9yjSKKSVIw7 AS4rxayD0Zbo0ygseUpSFElH2gKhkxroYddvkLqLKR+Z+v3p8NFjRmdrlebhMqfuoOA0ZyMhd1Re8 KR32kl0ribS4884UzpVLiX/rSeE8ybgflKYXnoG8dwtkLblvEE4TGHmJGnruxBjDx0QxNrtJatX8l gye584hBhJe9hHO1P5lwRoZoS9A27Yhn7yE6Pt2mZOv40eJI19r49O9ExSby1m8LM4WhIHs9PeXxH ukHWjeSuCoEzlRHm4TRFdnriklaxEvYKNqNwmB4HPj8cpOfbekC/tWg7+Ckx93JioASS75cNE1GSC zi9mCfbg==; Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfTbz-0006DY-TG for linux-arm-kernel@lists.infradead.org; Fri, 04 Jan 2019 17:50:24 +0000 Received: by mail-pl1-x644.google.com with SMTP id z23so17738021plo.0 for ; Fri, 04 Jan 2019 09:50:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ov2inzM6fmFsHxVXZyw47G5jAGapuFYmlo7Z2pYF+A4=; b=NSDrUz1+OyzaRb50gRYowv+DmQFRwrYEXrwcexaVdgpbtm2OcCQH/c6IsvgxnNbUQV SQnmB0ervyPs5xksbILe2uICoHmidWtJwA5H2aSuVzCNH2SnOSQAG9JA+m/FQLPV+R2d BWu0VNNM4KYaWIkv89pXgIjtQ5sqARb4KvuDe39Zr/GX37GyEyLcdWgUrgRAXHmUZWav WXHC4xgs1eMbwmJmahKuHVMHa7RCRA4CsIRoFR+XJEGBlNy0Tr6d2+HVQJ15EG3dhgKx fd+3ru78xYV8vf/pv1+yvVtpnzKqIyoA9+I7oxfxUvQ+8eNm4GzUD5R8A8Xd0sSTEP4k XOpQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ov2inzM6fmFsHxVXZyw47G5jAGapuFYmlo7Z2pYF+A4=; b=nJJKxu/PYC9whIBVvA4mvmZ/wOOECZL33U9GvvWYu3+iVaGBfEgM8+e5dkh2K8LRW3 IZXWUuuwc2j5f4kumjC/nZAVgAymSmU1z5Fq/alXsENx/kmZzEhlVZk0738H7pEy77d6 iSvU9YEVfnhCjkeK65mhiXBPU4exE+J3bGjP033h5HjKcGQAbLBn2T+kJWK6nMpiO2BN OvTRkmxPkDNkXYMNhSy882hG8znsAFHr2yX2aH+FEWFIIdhXKOdMekJomwbpVeiKmRXS XdD4haVpBDSRPhiBjfNS7ZSoG700YZaJjey+Lq4y+spao2ytKrjtdsIln2cUJMT2NZRa AO6A== X-Gm-Message-State: AJcUukckGlm5jUDhIPVNxpDcqNYYfCV4qTSYb5CT/GJWg8gnvtdfi8JX ZlI7y03aGddanQSBO6DoMI0= X-Google-Smtp-Source: ALg8bN7dll8BIEIMeQjyCMVC2YFm7bkE5lkyAhEm2YQ+R2M1KCYoAMOgs4MlapKUQffzuuYBvNp1nw== X-Received: by 2002:a17:902:4324:: with SMTP id i33mr50716390pld.227.1546624218388; Fri, 04 Jan 2019 09:50:18 -0800 (PST) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id i193sm100699632pgc.22.2019.01.04.09.50.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Jan 2019 09:50:17 -0800 (PST) From: Andrey Smirnov To: linux-pci@vger.kernel.org Subject: [PATCH v2 19/20] PCI: dwc: Make use of GENMASK/FIELD_PREP Date: Fri, 4 Jan 2019 09:49:24 -0800 Message-Id: <20190104174925.17153-20-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104174925.17153-1-andrew.smirnov@gmail.com> References: <20190104174925.17153-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190104_125023_957680_1C732C38 X-CRM114-Status: GOOD ( 12.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "A.s. Dong" , Lorenzo Pieralisi , Richard Zhu , linux-arm-kernel@lists.infradead.org, Andrey Smirnov , Gustavo Pimentel , linux-kernel@vger.kernel.org, Fabio Estevam , linux-imx@nxp.com, Bjorn Helgaas , Leonard Crestez , Chris Healy , Lucas Stach Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Convert various mult-bit fields to be defined using GENMASK/FIELD_PREP. This way bit field boundaries are defined in a single place only as well as defined in a way that makes it easier to verify them against reference manual. No functional change intended. Cc: Lorenzo Pieralisi Cc: Bjorn Helgaas Cc: Fabio Estevam Cc: Chris Healy Cc: Lucas Stach Cc: Leonard Crestez Cc: "A.s. Dong" Cc: Richard Zhu Cc: linux-imx@nxp.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-pci@vger.kernel.org Acked-by: Gustavo Pimentel Signed-off-by: Andrey Smirnov --- drivers/pci/controller/dwc/pcie-designware.h | 29 +++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h index 348e91b6daa2..0de653284fca 100644 --- a/drivers/pci/controller/dwc/pcie-designware.h +++ b/drivers/pci/controller/dwc/pcie-designware.h @@ -11,6 +11,7 @@ #ifndef _PCIE_DESIGNWARE_H #define _PCIE_DESIGNWARE_H +#include #include #include #include @@ -30,11 +31,12 @@ /* Synopsys-specific PCIe configuration registers */ #define PCIE_PORT_LINK_CONTROL 0x710 -#define PORT_LINK_MODE_MASK (0x3f << 16) -#define PORT_LINK_MODE_1_LANES (0x1 << 16) -#define PORT_LINK_MODE_2_LANES (0x3 << 16) -#define PORT_LINK_MODE_4_LANES (0x7 << 16) -#define PORT_LINK_MODE_8_LANES (0xf << 16) +#define PORT_LINK_MODE_MASK GENMASK(21, 16) +#define PORT_LINK_MODE(n) FIELD_PREP(PORT_LINK_MODE_MASK, n) +#define PORT_LINK_MODE_1_LANES PORT_LINK_MODE(0x1) +#define PORT_LINK_MODE_2_LANES PORT_LINK_MODE(0x3) +#define PORT_LINK_MODE_4_LANES PORT_LINK_MODE(0x7) +#define PORT_LINK_MODE_8_LANES PORT_LINK_MODE(0xf) #define PCIE_PORT_DEBUG0 0x728 #define PORT_LOGIC_LTSSM_STATE_MASK 0x1f @@ -45,11 +47,12 @@ #define PCIE_LINK_WIDTH_SPEED_CONTROL 0x80C #define PORT_LOGIC_SPEED_CHANGE BIT(17) -#define PORT_LOGIC_LINK_WIDTH_MASK (0x1f << 8) -#define PORT_LOGIC_LINK_WIDTH_1_LANES (0x1 << 8) -#define PORT_LOGIC_LINK_WIDTH_2_LANES (0x2 << 8) -#define PORT_LOGIC_LINK_WIDTH_4_LANES (0x4 << 8) -#define PORT_LOGIC_LINK_WIDTH_8_LANES (0x8 << 8) +#define PORT_LOGIC_LINK_WIDTH_MASK GENMASK(12, 8) +#define PORT_LOGIC_LINK_WIDTH(n) FIELD_PREP(PORT_LOGIC_LINK_WIDTH_MASK, n) +#define PORT_LOGIC_LINK_WIDTH_1_LANES PORT_LOGIC_LINK_WIDTH(0x1) +#define PORT_LOGIC_LINK_WIDTH_2_LANES PORT_LOGIC_LINK_WIDTH(0x2) +#define PORT_LOGIC_LINK_WIDTH_4_LANES PORT_LOGIC_LINK_WIDTH(0x4) +#define PORT_LOGIC_LINK_WIDTH_8_LANES PORT_LOGIC_LINK_WIDTH(0x8) #define PCIE_MSI_ADDR_LO 0x820 #define PCIE_MSI_ADDR_HI 0x824 @@ -75,9 +78,9 @@ #define PCIE_ATU_UPPER_BASE 0x910 #define PCIE_ATU_LIMIT 0x914 #define PCIE_ATU_LOWER_TARGET 0x918 -#define PCIE_ATU_BUS(x) (((x) & 0xff) << 24) -#define PCIE_ATU_DEV(x) (((x) & 0x1f) << 19) -#define PCIE_ATU_FUNC(x) (((x) & 0x7) << 16) +#define PCIE_ATU_BUS(x) FIELD_PREP(GENMASK(31, 24), x) +#define PCIE_ATU_DEV(x) FIELD_PREP(GENMASK(23, 19), x) +#define PCIE_ATU_FUNC(x) FIELD_PREP(GENMASK(18, 16), x) #define PCIE_ATU_UPPER_TARGET 0x91C #define PCIE_MISC_CONTROL_1_OFF 0x8BC