From patchwork Fri Jun 21 16:39:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 1120423 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ud99mkFq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45Vkv84vGBz9sBb for ; Sat, 22 Jun 2019 02:40:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726194AbfFUQkO (ORCPT ); Fri, 21 Jun 2019 12:40:14 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:45960 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725985AbfFUQkO (ORCPT ); Fri, 21 Jun 2019 12:40:14 -0400 Received: by mail-pf1-f193.google.com with SMTP id r1so3867178pfq.12; Fri, 21 Jun 2019 09:40:13 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=2IgUDhVqnZ8k9zguuMKJ5AeaSmmdRNsRB+Xd+mp5hgs=; b=Ud99mkFqZdT93NgONfoC7H1liw3Br8yMsWJ1tKy5eZOl35FyKD3b+R8hNIaxqJSUOp hlwKBSZURFw5kD5bbct9rsiOgrWonsrGOrUjIXsJJaqQncpbLztQuagcmCBld8GJPbpa 1GtnF6nY0Yk65VuaRhOpO6Dm+0zxD0WmT1lTbOly816f8oqoT2Or9Kv8dNcS2I5yZRmR Ux0As5qkUaJzk0wiL+cPWVnvj4PiEFnR2SLAPck3kfkk50E7YA6o378KpUQtIS1NExkC XpHlgNQ5WwjoGCylqP3szEpNaQlRyvVPHlfCdTt3oZb2b7zokYRFY5NLRo/75/dwZxpb 5X8g== 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=2IgUDhVqnZ8k9zguuMKJ5AeaSmmdRNsRB+Xd+mp5hgs=; b=jZXrfcqusf3DrV21sed73FNmoIbqXtiCFGqhsSSrWAlLbeqwRu9h9vTTY+Kc0we69m I5D/eU8pTHyQnNCSSl8WWUqqnPB6gri1tnPMDWg+of+qv9Ydsw4BoWx3gyfJqUpVHFtt WhOs/EldoZWGgnQgZorS6b6i+ZWkE81gqE08PsSuXxxc5972d7J18awvR9mdMDX69l3K qpDNyfqSqq/MYMg2zWdzDlXf/a00z91vSRS8Hwr7Vv9BLqDTMyvYxLG3rrwijQ/cAQBd W+VXFqhAzJ5Vjq75cQMNOrIS7ANj/XA21L3gTlQx1clHJOTfvyqg6zLaGmDaNA3vPRzu XOwA== X-Gm-Message-State: APjAAAX3AyVYvPP/nAg96E0Pvg/rYU9ePaZbPe/vQmESkZW+rmaIV7w/ D6WaLei4vVgKiEftDYSej7o= X-Google-Smtp-Source: APXvYqyXbcJjprGeaBIgVzs96UiAfpSm2B+Tj1uMXB/VRI5m36QXniyeA1HZFkG67i83JewfIahBWw== X-Received: by 2002:a63:c20e:: with SMTP id b14mr18670962pgd.96.1561135213429; Fri, 21 Jun 2019 09:40:13 -0700 (PDT) Received: from localhost.localdomain ([112.196.181.13]) by smtp.googlemail.com with ESMTPSA id n89sm25702450pjc.0.2019.06.21.09.39.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 21 Jun 2019 09:40:13 -0700 (PDT) From: Puranjay Mohan To: Shuah Khan Cc: Puranjay Mohan , Bjorn Helgaas , netdev , Linux Kernel Mailing List , linux-kernel-mentees@lists.linuxfoundation.org, linux-pci@vger.kernel.org Subject: [PATCH 1/3] net: ethernet: atheros: atlx: Rename local PCI defines to generic names Date: Fri, 21 Jun 2019 22:09:19 +0530 Message-Id: <20190621163921.26188-2-puranjay12@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190621163921.26188-1-puranjay12@gmail.com> References: <20190621163921.26188-1-puranjay12@gmail.com> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Rename all local PCI definitons to Generic PCI definitions to make them compatible with generic definitions present in pci_regs.h Signed-off-by: Puranjay Mohan --- drivers/net/ethernet/atheros/atlx/atl2.c | 4 ++-- drivers/net/ethernet/atheros/atlx/atl2.h | 2 +- drivers/net/ethernet/atheros/atlx/atlx.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c index 3a3fb5ce0fee..478db3fe920a 100644 --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c @@ -2103,13 +2103,13 @@ static s32 atl2_reset_hw(struct atl2_hw *hw) int i; /* Workaround for PCI problem when BIOS sets MMRBC incorrectly. */ - atl2_read_pci_cfg(hw, PCI_REG_COMMAND, &pci_cfg_cmd_word); + atl2_read_pci_cfg(hw, PCI_COMMAND, &pci_cfg_cmd_word); if ((pci_cfg_cmd_word & (CMD_IO_SPACE|CMD_MEMORY_SPACE|CMD_BUS_MASTER)) != (CMD_IO_SPACE|CMD_MEMORY_SPACE|CMD_BUS_MASTER)) { pci_cfg_cmd_word |= (CMD_IO_SPACE|CMD_MEMORY_SPACE|CMD_BUS_MASTER); - atl2_write_pci_cfg(hw, PCI_REG_COMMAND, &pci_cfg_cmd_word); + atl2_write_pci_cfg(hw, PCI_COMMAND, &pci_cfg_cmd_word); } /* Clear Interrupt mask to stop board from generating diff --git a/drivers/net/ethernet/atheros/atlx/atl2.h b/drivers/net/ethernet/atheros/atlx/atl2.h index d97613bd15d5..c53b810a831d 100644 --- a/drivers/net/ethernet/atheros/atlx/atl2.h +++ b/drivers/net/ethernet/atheros/atlx/atl2.h @@ -202,7 +202,7 @@ static void atl2_force_ps(struct atl2_hw *hw); #define MII_DBG_DATA 0x1E /* PCI Command Register Bit Definitions */ -#define PCI_REG_COMMAND 0x04 +#define PCI_COMMAND 0x04 #define CMD_IO_SPACE 0x0001 #define CMD_MEMORY_SPACE 0x0002 #define CMD_BUS_MASTER 0x0004 diff --git a/drivers/net/ethernet/atheros/atlx/atlx.h b/drivers/net/ethernet/atheros/atlx/atlx.h index 7f5d4e24eb9f..09464cb02ce0 100644 --- a/drivers/net/ethernet/atheros/atlx/atlx.h +++ b/drivers/net/ethernet/atheros/atlx/atlx.h @@ -445,7 +445,7 @@ #define MII_DBG_DATA 0x1E /* PCI Command Register Bit Definitions */ -#define PCI_REG_COMMAND 0x04 /* PCI Command Register */ +#define PCI_COMMAND 0x04 /* PCI Command Register */ #define CMD_IO_SPACE 0x0001 #define CMD_MEMORY_SPACE 0x0002 #define CMD_BUS_MASTER 0x0004 From patchwork Fri Jun 21 16:39:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 1120425 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bX1+vj4y"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45VkvH60PXz9sBb for ; Sat, 22 Jun 2019 02:40:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726062AbfFUQkV (ORCPT ); Fri, 21 Jun 2019 12:40:21 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:44099 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725985AbfFUQkU (ORCPT ); Fri, 21 Jun 2019 12:40:20 -0400 Received: by mail-pl1-f196.google.com with SMTP id t7so3254429plr.11; Fri, 21 Jun 2019 09:40:20 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=+LmO7ticrmC3JfIg4AQOqPuyqJt0GySV9L0s39/uDrw=; b=bX1+vj4y8vN6rtL+XEllGurzFlBmP/jtny9CO82beZphLgDbQLa4wrGLVjLp3mCMI3 ZPjztdEuXY/9iRPl0vPJ44rCBmkzzJ9QwF4fjdnlucDDK40vh3LjawXjMCk3VbBW8l4Q lZP0d/sPQrwsL0ifMWpIYJAhTIy8FsaRfqEYHrtym1w9rjIcYTCe2hWgDzAYLSDHGFgd ynzdjh+bR8dqm/x+sfvTHrhmR7ertFM6P/UTWRc3/HxRg0Y4udKNyeW8lLMAZV+PRNZp fEVLrPutlc9p5SqIwBZDUgE0d1uJTjeJoSZOh6KzmnsWy6UM35PlwXgkkN16VI04RE0F CvVw== 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=+LmO7ticrmC3JfIg4AQOqPuyqJt0GySV9L0s39/uDrw=; b=TQRfy7vGd3L26KPoZBeZXHQcSacL+AUQQG76odn1OuTB/Rz8RK+eMtd/r92EzKqSrz qyl4f/VvY5aTn9MWRBL0lSiu3HbMIcEz7eeppSjm+oP8aCZx+HGeoEB9U1SwTOmA2csf a9iNvvb/zzu/cSjX/EtXAlzHybOvyp5IQ/Wr9waRE/+XYeSY7zRsMiAIjGJtOLugaoEO F4OKx7YU5jgD74pvz7OwyahlgvVXNz9asY5Ej5IjkB74aU0IzUG682hhmVWQ+Fugvgj2 GcwLLyqEb3s8eXh9pgib7qJcBmLk4zZwula3iZCPoWua7v1yd1ndIAYmCyf5zs0uYXDy mWtQ== X-Gm-Message-State: APjAAAV4Ta780i0fYZ4XI3L4WeV0EGR9ct/SDoYoU2TdJzxfAJ4FAo62 YkLZ0paPAgDhdCdCqcc9qnY= X-Google-Smtp-Source: APXvYqw7gTvJNhEDHEATxSdI6uuCNc7jtakHAR7EjGw5f/OMefYzh0AMXWEttyJiDdlMlsWRVLy85Q== X-Received: by 2002:a17:902:1e6:: with SMTP id b93mr88496629plb.295.1561135220028; Fri, 21 Jun 2019 09:40:20 -0700 (PDT) Received: from localhost.localdomain ([112.196.181.13]) by smtp.googlemail.com with ESMTPSA id n89sm25702450pjc.0.2019.06.21.09.40.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 21 Jun 2019 09:40:19 -0700 (PDT) From: Puranjay Mohan To: Shuah Khan Cc: Puranjay Mohan , Bjorn Helgaas , netdev , Linux Kernel Mailing List , linux-kernel-mentees@lists.linuxfoundation.org, linux-pci@vger.kernel.org Subject: [PATCH 2/3] net: ethernet: atheros: atlx: Include generic PCI definitions Date: Fri, 21 Jun 2019 22:09:20 +0530 Message-Id: <20190621163921.26188-3-puranjay12@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190621163921.26188-1-puranjay12@gmail.com> References: <20190621163921.26188-1-puranjay12@gmail.com> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Include the uapi/linux/pci_regs.h header file which contains the generic PCI defines. Signed-off-by: Puranjay Mohan --- drivers/net/ethernet/atheros/atlx/atl2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c index 478db3fe920a..58abadd18df2 100644 --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include From patchwork Fri Jun 21 16:39:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 1120427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Kgf4e/ku"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45VkvS2Y3Dz9sBb for ; Sat, 22 Jun 2019 02:40:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726281AbfFUQka (ORCPT ); Fri, 21 Jun 2019 12:40:30 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:38913 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725985AbfFUQka (ORCPT ); Fri, 21 Jun 2019 12:40:30 -0400 Received: by mail-pg1-f196.google.com with SMTP id 196so3640314pgc.6; Fri, 21 Jun 2019 09:40:29 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=W/+t2oF2T5eKqD5lT+8QUcLyNJmob85epyf9XJ3GxDw=; b=Kgf4e/ku7hwdnwqim/1SbJpQ5kGBJoNmQYquTn1A1plv/H2fh0Jh6AAm3KZKVNaZgq nPgi8op6X+XC1c8R6/CfKv60wnU26d02nUWIfLpLSUcmslW12tUJinjzcG3j7/l/hbSR 7P8Bo2dpSY5sWum/w7s/L9LxjnAaGyWqIc5QZyRxb562ln+nmQFeToUep5+cU887hTt+ oLrIDgTRKu/cO0GdfiYz1wqmnX2M/4Sq0/PLjiqVFyKqiKH8y9iOGv2IPIHDqgZACv+8 OPewJQ7/K9UvnWnt1lAQKSW9iWQutAdxmHKzkNFZiSESLvD+NGeQXbu4dtO1HJAOgxpq M/hw== 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=W/+t2oF2T5eKqD5lT+8QUcLyNJmob85epyf9XJ3GxDw=; b=K5EC0JCwrVzbTuYQzcBXW3Kp7ttVIvR+u5Xv0j5kNzUeJQa/Pr/amAfjAeyNc0mecJ tbjapbJ4h2rz7EXS1FVsT+cpl54SahUDQEY3kACHWuarhbdDMq5T2e9FfIGSnIAWK4Nf Hm18R13VZtpQCmPs716f1lt5fDdhD0prFzrycV+a6BzPyCRLKsKDiYcMMpfJTWVgtnPr 0jb3SI8m0jKIN5mb9fIXhDzws7nJQIpzattPK8UFN9dZQCb04Pkn3ny56XXGL2vwfOUa 5+jxouETyxsmrreW40T3Is+VwZWlHpDHY2Eit/HbaDq6Hq5v14lUztmylcZ/Jhj8G7DE fjOg== X-Gm-Message-State: APjAAAV6+gPxgJvWNTnsbAvkn2k+z/w+Un39Tc/KW+9CS4HIc+cWY18V dfokq4Zz3iIIwG0Y4gMSKOU= X-Google-Smtp-Source: APXvYqynM1s+PyD4cl/ai3zSbzmA/prIyg8EVBjmhCpUibSYWaTLbyW66gmF1EipEN4MivuwfBBQqg== X-Received: by 2002:a17:90a:b78b:: with SMTP id m11mr7978235pjr.106.1561135229262; Fri, 21 Jun 2019 09:40:29 -0700 (PDT) Received: from localhost.localdomain ([112.196.181.13]) by smtp.googlemail.com with ESMTPSA id n89sm25702450pjc.0.2019.06.21.09.40.20 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 21 Jun 2019 09:40:28 -0700 (PDT) From: Puranjay Mohan To: Shuah Khan Cc: Puranjay Mohan , Bjorn Helgaas , netdev , Linux Kernel Mailing List , linux-kernel-mentees@lists.linuxfoundation.org, linux-pci@vger.kernel.org Subject: [PATCH 3/3] net: ethernet: atheros: atlx: Remove unused and private PCI definitions Date: Fri, 21 Jun 2019 22:09:21 +0530 Message-Id: <20190621163921.26188-4-puranjay12@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190621163921.26188-1-puranjay12@gmail.com> References: <20190621163921.26188-1-puranjay12@gmail.com> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Remove unused private PCI definitions from skfbi.h because generic PCI symbols are already included from pci_regs.h. Signed-off-by: Puranjay Mohan --- drivers/net/ethernet/atheros/atlx/atl2.h | 2 -- drivers/net/ethernet/atheros/atlx/atlx.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/net/ethernet/atheros/atlx/atl2.h b/drivers/net/ethernet/atheros/atlx/atl2.h index c53b810a831d..1b25d6d747de 100644 --- a/drivers/net/ethernet/atheros/atlx/atl2.h +++ b/drivers/net/ethernet/atheros/atlx/atl2.h @@ -32,7 +32,6 @@ int ethtool_ioctl(struct ifreq *ifr); #endif -#define PCI_COMMAND_REGISTER PCI_COMMAND #define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE #define ATL2_WRITE_REG(a, reg, value) (iowrite32((value), \ @@ -202,7 +201,6 @@ static void atl2_force_ps(struct atl2_hw *hw); #define MII_DBG_DATA 0x1E /* PCI Command Register Bit Definitions */ -#define PCI_COMMAND 0x04 #define CMD_IO_SPACE 0x0001 #define CMD_MEMORY_SPACE 0x0002 #define CMD_BUS_MASTER 0x0004 diff --git a/drivers/net/ethernet/atheros/atlx/atlx.h b/drivers/net/ethernet/atheros/atlx/atlx.h index 09464cb02ce0..4d355dbc2d01 100644 --- a/drivers/net/ethernet/atheros/atlx/atlx.h +++ b/drivers/net/ethernet/atheros/atlx/atlx.h @@ -445,7 +445,6 @@ #define MII_DBG_DATA 0x1E /* PCI Command Register Bit Definitions */ -#define PCI_COMMAND 0x04 /* PCI Command Register */ #define CMD_IO_SPACE 0x0001 #define CMD_MEMORY_SPACE 0x0002 #define CMD_BUS_MASTER 0x0004