From patchwork Thu Jun 20 18:07:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 11007613 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 241CD112C for ; Thu, 20 Jun 2019 18:24:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17A1E28893 for ; Thu, 20 Jun 2019 18:24:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0ABEE288CA; Thu, 20 Jun 2019 18:24:34 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A06012887A for ; Thu, 20 Jun 2019 18:24:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727485AbfFTSYV (ORCPT ); Thu, 20 Jun 2019 14:24:21 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:43188 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728123AbfFTSIg (ORCPT ); Thu, 20 Jun 2019 14:08:36 -0400 Received: by mail-pf1-f196.google.com with SMTP id i189so2092708pfg.10; Thu, 20 Jun 2019 11:08:36 -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=1iF2ZB803XlTIr6nvosftGxcuWC6YkTcPa42GxL7qVg=; b=dXqdQ5v4XNwaaSAeTuU/PFr+LTjbmJXHwYjb0XyYvUBuN1fuVNXpXtrzzLLJV2DqFt ePdGTtvXjb0HKW6pyn6Do5vapM/0MCv8TfUqpxe+NuLY0Tbjm2c9PN2wm9xlvJmh8e01 X7A3ISf11wSmgXOCTDj0L2S8xdkXAdDx4MFSspFKaVxhsKfpFsT2eEWA2kFbwUo/wgwX 2b1zvHol0U7XHUKAWYDsAUqV7C7wwOpbVqzevhBKJS+X+Vm2uxm3o13oraST3skyY+XE jsBlIXnFjZMtx+E6qRh+FgSE6FlUEYbM0RqhBmfkxPq5dYpjqEgPk+Lu3nctvRAqg6qY JpmA== 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=1iF2ZB803XlTIr6nvosftGxcuWC6YkTcPa42GxL7qVg=; b=nkFgRK/Ipc4KxZL7wookTAJET2Q6QDMBQmY7qBFD0RiFi0RZAzTc9uk+sOoMY0kkHx EkmXgDrH8v2tyOWFdj3t0VshlPAArL98WCTTfGDprRzbyFbJfzET39YPfvIz+VDpbevW OK3tSuQIx2IP2yQ5PnoNJI16L8cK7NZu9U+PPtq507ndtYU7NXvzWdx7i5/WA+Q6vseK rbCCv/pdRv428SiCwLfybzdqy9xPcA2+XfReVAXW6nn+OOVq5bXO+Paa9IP6clHOjrwO xtOqmNMzMcDMeEYKhSssDhLOtdKQQB+ybCnP0m6wQf72mEOLUobiE+ovoAvlxkh0Eec7 ByqQ== X-Gm-Message-State: APjAAAVayS1x1B8wyevmildZrhzacVDAmt8Gf9kRZYy5GXGTdJBNn7Um 6xPgk0+CgmgPME53bzxDsl8= X-Google-Smtp-Source: APXvYqxCWD78/GO2Q+QXxWvVYQNthB+ZkCB4FDaOHC/jm3YD8nwpf6T00fKGG+aufWRx466WdoPyHg== X-Received: by 2002:aa7:9190:: with SMTP id x16mr119008844pfa.86.1561054115722; Thu, 20 Jun 2019 11:08:35 -0700 (PDT) Received: from localhost.localdomain ([112.196.181.13]) by smtp.googlemail.com with ESMTPSA id 85sm289016pgb.52.2019.06.20.11.08.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 20 Jun 2019 11:08:35 -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 v2 1/3] net: fddi: skfp: Rename PCI_REV_ID to PCI_REVISION_ID Date: Thu, 20 Jun 2019 23:37:52 +0530 Message-Id: <20190620180754.15413-2-puranjay12@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190620180754.15413-1-puranjay12@gmail.com> References: <20190620180754.15413-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 X-Virus-Scanned: ClamAV using ClamSMTP Rename the PCI_REV_ID define to PCI_REVISION_ID in skfbi.h and drvfbi.c to make it compatible with the pci_regs.h which defines it as PCI_REVISION_ID. Signed-off-by: Puranjay Mohan --- drivers/net/fddi/skfp/drvfbi.c | 2 +- drivers/net/fddi/skfp/h/skfbi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/fddi/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c index bdd5700e71fa..b324c1acf195 100644 --- a/drivers/net/fddi/skfp/drvfbi.c +++ b/drivers/net/fddi/skfp/drvfbi.c @@ -127,7 +127,7 @@ static void card_start(struct s_smc *smc) * at very first before any other initialization functions is * executed. */ - rev_id = inp(PCI_C(PCI_REV_ID)) ; + rev_id = inp(PCI_C(PCI_REVISION_ID)) ; if ((rev_id & 0xf0) == SK_ML_ID_1 || (rev_id & 0xf0) == SK_ML_ID_2) { smc->hw.hw_is_64bit = TRUE ; } else { diff --git a/drivers/net/fddi/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h index 89557457b352..a05ce16171be 100644 --- a/drivers/net/fddi/skfp/h/skfbi.h +++ b/drivers/net/fddi/skfp/h/skfbi.h @@ -31,7 +31,7 @@ #define PCI_DEVICE_ID 0x02 /* 16 bit Device ID */ #define PCI_COMMAND 0x04 /* 16 bit Command */ #define PCI_STATUS 0x06 /* 16 bit Status */ -#define PCI_REV_ID 0x08 /* 8 bit Revision ID */ +#define PCI_REVISION_ID 0x08 /* 8 bit Revision ID */ #define PCI_CLASS_CODE 0x09 /* 24 bit Class Code */ #define PCI_CACHE_LSZ 0x0c /* 8 bit Cache Line Size */ #define PCI_LAT_TIM 0x0d /* 8 bit Latency Timer */ From patchwork Thu Jun 20 18:07:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 11007611 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 7FB5C112C for ; Thu, 20 Jun 2019 18:24:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70EBA2887E for ; Thu, 20 Jun 2019 18:24:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6470A288D7; Thu, 20 Jun 2019 18:24:12 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8ABB9288D9 for ; Thu, 20 Jun 2019 18:24:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727421AbfFTSYJ (ORCPT ); Thu, 20 Jun 2019 14:24:09 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38359 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726682AbfFTSIk (ORCPT ); Thu, 20 Jun 2019 14:08:40 -0400 Received: by mail-pg1-f195.google.com with SMTP id v11so1984973pgl.5; Thu, 20 Jun 2019 11:08:39 -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=DElqIywf6JUcWuo0rZ9a6EwgIu3tUka4AvA4dzhpqYE=; b=G56l50yP0b6U6H4NdWWf/Dv6OP6WqAUmAoeWuHJJqTwqT9iaG1vBNKZYsh5Giuvhnw aED6fgUw54XLonnrYNZZv6Cno7U/zr4c6hcbl+H3d+KIDs2Xsx/z2U/1261AbHzKUg4r oNevhrr0tWXaP+L6SoMosXmCiEhK2au9AS94MvDNOVXEwA7u8oD/hgDDguZ5dMs3SmmP 82tINfOSiarXeRImZlPpp3hhFmrUQbvD0DLpiDzKwclAM+5YRCCqtJtomlq9zwQ1rafp 1r4t6oeiUv4rhpyyu/UiaUGP3QKBRvHniTQvlPiXqkGo/QBlcDlWFUa3//uYec3h3w3o x9mw== 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=DElqIywf6JUcWuo0rZ9a6EwgIu3tUka4AvA4dzhpqYE=; b=JSfGMimt+X1IwGqxjHvpX04hgM6klerN2EhgyT5vshNAiDubNK2SjntOH5IGKRnOSV t53Bc4JyjUvqPVJV7aVd9pNoRuW2msqDaWzvf5tCwPmWoIHwoEGLI/dQojn5FcqcofrO 240vpMGrP5b0quXyklWYzWsAjKWkssAHRurvz8I1tdgiRfqRCG6yUpNgZPbNQk/hFp9x fL95t4vb4F2k/hSI9o1eoGgFYbzKnPNtw3A/8YdL50CGfHPvuiHIeFQvE8XSD+cgwcwg 6HDKUZLSNYy1t0thi5NZSAC7tO09jTEJ8CcOz84d+3GfTavDLaWa4UqcG1tslgfNnX+B 55kg== X-Gm-Message-State: APjAAAURfnt1lQ+ueMn9P/ZUj4gRKP/Ed9atGLdoCykepPSSe8kXSmIU aasbwHjyEIuPVJlB6OV0g2s= X-Google-Smtp-Source: APXvYqxFAQJsCXYzQ+qH0cA1M0uMpESe7qshj8mj8l4KMcP4Yo4JkiXtEV1IBXTaRIWBw9MoK6+1kw== X-Received: by 2002:a62:3c3:: with SMTP id 186mr14403969pfd.21.1561054119280; Thu, 20 Jun 2019 11:08:39 -0700 (PDT) Received: from localhost.localdomain ([112.196.181.13]) by smtp.googlemail.com with ESMTPSA id 85sm289016pgb.52.2019.06.20.11.08.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 20 Jun 2019 11:08:38 -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 v2 2/3] net: fddi: skfp: Include generic PCI definitions Date: Thu, 20 Jun 2019 23:37:53 +0530 Message-Id: <20190620180754.15413-3-puranjay12@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190620180754.15413-1-puranjay12@gmail.com> References: <20190620180754.15413-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 X-Virus-Scanned: ClamAV using ClamSMTP Include the uapi/linux/pci_regs.h header file which contains the generic PCI defines. Signed-off-by: Puranjay Mohan --- drivers/net/fddi/skfp/drvfbi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/fddi/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c index b324c1acf195..e8245cb281f8 100644 --- a/drivers/net/fddi/skfp/drvfbi.c +++ b/drivers/net/fddi/skfp/drvfbi.c @@ -20,7 +20,7 @@ #include "h/supern_2.h" #include "h/skfbiinc.h" #include - +#include #ifndef lint static const char ID_sccs[] = "@(#)drvfbi.c 1.63 99/02/11 (C) SK " ; #endif From patchwork Thu Jun 20 18:07:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 11007609 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 9F27176 for ; Thu, 20 Jun 2019 18:24:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90B7B287BB for ; Thu, 20 Jun 2019 18:24:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8472528894; Thu, 20 Jun 2019 18:24:09 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82C42288D9 for ; Thu, 20 Jun 2019 18:24:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728476AbfFTSX4 (ORCPT ); Thu, 20 Jun 2019 14:23:56 -0400 Received: from mail-pl1-f171.google.com ([209.85.214.171]:43829 "EHLO mail-pl1-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727421AbfFTSIo (ORCPT ); Thu, 20 Jun 2019 14:08:44 -0400 Received: by mail-pl1-f171.google.com with SMTP id cl9so1688765plb.10; Thu, 20 Jun 2019 11:08:43 -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=RnxLjWPSrPTq8sT1wSRu/Rnjjehe0Ylz8LY1mQFyjg0=; b=g3cPsnlHv9z/PG/ZXBZGSbjRknz1kbLwKI7vUyqDLIiDavoCrAycG242Y5XuM+jUFD f4tvWjEcLZwl76xt2UpbsxlMhj3B9YbUXixivrwJBBhSPolRKliuJQBHroEOrs6TpS0m J1ZBCUS/gC5L1GrtaQ51dah7uecJt5UiJ1+bQpzwKrG1sz/fEaFPSgrW7APDP7sAZJDc rjbdGW211wUspkvnRmR1ePV8bqMOIWuh7IVsgmMqSeEwauzjDlyBJ87Jzrz/x/SGHZ/3 60iX+gmCDwqCDGYx/GCAWACtoQVTYwbfmas5V6uRXKusuQhKFeZ0mcoDGl34tI6i6FWR r2Ug== 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=RnxLjWPSrPTq8sT1wSRu/Rnjjehe0Ylz8LY1mQFyjg0=; b=SyEMCNFk+oQPPCTNBQkXGPdZeg2sr5Eydc3fqzYZs4RQ+K+On4tV8S0XUPH4tijonS Ouc9yUE82D16eK6E6x+chZVjWCY9lRsBi0mq7e0IBqKLt8MFRrioy1p0eK8CroUOSfX/ yaa0XvriyOngGWqQfjAdMX0hrc1RCcPOK7cKFjHnvI8XcRWzw2jsW0MqusMYC59TDolv D6/O5+zhnxNc4IZXb9mcAJacKbB6o9ql1W6mcYKeVa6DskDLqodMYl2ySpA3kNRlV2QF kqZJ7K7ejxt8Yo92xJTYehJQWQ7EyXnVsm15C7UCy+2E8KK4Rj5YurX3QTeaxJiInAhf Omew== X-Gm-Message-State: APjAAAXI//4mJMKJkEDx3PbAQ+Vd7u4dTcwS+SUXd+idztwSEYtrviLA zIBGEg+MyoGbgqB7sQYBZmQ= X-Google-Smtp-Source: APXvYqzl/fTenx4sJnCj/590RtMugw+Hrd03dmnwYCJJ97mbgmR6v3tGwL4d1qwxi+bJPwUQv20s4Q== X-Received: by 2002:a17:902:d88e:: with SMTP id b14mr73836285plz.153.1561054122791; Thu, 20 Jun 2019 11:08:42 -0700 (PDT) Received: from localhost.localdomain ([112.196.181.13]) by smtp.googlemail.com with ESMTPSA id 85sm289016pgb.52.2019.06.20.11.08.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 20 Jun 2019 11:08:42 -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 v2 3/3] net: fddi: skfp: Remove unused private PCI definitions Date: Thu, 20 Jun 2019 23:37:54 +0530 Message-Id: <20190620180754.15413-4-puranjay12@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190620180754.15413-1-puranjay12@gmail.com> References: <20190620180754.15413-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 X-Virus-Scanned: ClamAV using ClamSMTP Remove unused and private PCI definitions from skfbi.h because generic PCI symbols are already included from pci_regs.h. Signed-off-by: Puranjay Mohan --- drivers/net/fddi/skfp/h/skfbi.h | 207 +------------------------------- 1 file changed, 1 insertion(+), 206 deletions(-) diff --git a/drivers/net/fddi/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h index a05ce16171be..a8af80148022 100644 --- a/drivers/net/fddi/skfp/h/skfbi.h +++ b/drivers/net/fddi/skfp/h/skfbi.h @@ -27,46 +27,6 @@ /* * Configuration Space header */ -#define PCI_VENDOR_ID 0x00 /* 16 bit Vendor ID */ -#define PCI_DEVICE_ID 0x02 /* 16 bit Device ID */ -#define PCI_COMMAND 0x04 /* 16 bit Command */ -#define PCI_STATUS 0x06 /* 16 bit Status */ -#define PCI_REVISION_ID 0x08 /* 8 bit Revision ID */ -#define PCI_CLASS_CODE 0x09 /* 24 bit Class Code */ -#define PCI_CACHE_LSZ 0x0c /* 8 bit Cache Line Size */ -#define PCI_LAT_TIM 0x0d /* 8 bit Latency Timer */ -#define PCI_HEADER_T 0x0e /* 8 bit Header Type */ -#define PCI_BIST 0x0f /* 8 bit Built-in selftest */ -#define PCI_BASE_1ST 0x10 /* 32 bit 1st Base address */ -#define PCI_BASE_2ND 0x14 /* 32 bit 2nd Base address */ -/* Byte 18..2b: Reserved */ -#define PCI_SUB_VID 0x2c /* 16 bit Subsystem Vendor ID */ -#define PCI_SUB_ID 0x2e /* 16 bit Subsystem ID */ -#define PCI_BASE_ROM 0x30 /* 32 bit Expansion ROM Base Address */ -/* Byte 34..33: Reserved */ -#define PCI_CAP_PTR 0x34 /* 8 bit (ML) Capabilities Ptr */ -/* Byte 35..3b: Reserved */ -#define PCI_IRQ_LINE 0x3c /* 8 bit Interrupt Line */ -#define PCI_IRQ_PIN 0x3d /* 8 bit Interrupt Pin */ -#define PCI_MIN_GNT 0x3e /* 8 bit Min_Gnt */ -#define PCI_MAX_LAT 0x3f /* 8 bit Max_Lat */ -/* Device Dependent Region */ -#define PCI_OUR_REG 0x40 /* 32 bit (DV) Our Register */ -#define PCI_OUR_REG_1 0x40 /* 32 bit (ML) Our Register 1 */ -#define PCI_OUR_REG_2 0x44 /* 32 bit (ML) Our Register 2 */ -/* Power Management Region */ -#define PCI_PM_CAP_ID 0x48 /* 8 bit (ML) Power Management Cap. ID */ -#define PCI_PM_NITEM 0x49 /* 8 bit (ML) Next Item Ptr */ -#define PCI_PM_CAP_REG 0x4a /* 16 bit (ML) Power Management Capabilities */ -#define PCI_PM_CTL_STS 0x4c /* 16 bit (ML) Power Manag. Control/Status */ -/* Byte 0x4e: Reserved */ -#define PCI_PM_DAT_REG 0x4f /* 8 bit (ML) Power Manag. Data Register */ -/* VPD Region */ -#define PCI_VPD_CAP_ID 0x50 /* 8 bit (ML) VPD Cap. ID */ -#define PCI_VPD_NITEM 0x51 /* 8 bit (ML) Next Item Ptr */ -#define PCI_VPD_ADR_REG 0x52 /* 16 bit (ML) VPD Address Register */ -#define PCI_VPD_DAT_REG 0x54 /* 32 bit (ML) VPD Data Register */ -/* Byte 58..ff: Reserved */ /* * I2C Address (PCI Config) @@ -74,179 +34,14 @@ * Note: The temperature and voltage sensors are relocated on a different * I2C bus. */ -#define I2C_ADDR_VPD 0xA0 /* I2C address for the VPD EEPROM */ +#define I2C_ADDR_VPD 0xA0 /* I2C address for the VPD EEPROM */ -/* - * Define Bits and Values of the registers - */ -/* PCI_VENDOR_ID 16 bit Vendor ID */ -/* PCI_DEVICE_ID 16 bit Device ID */ -/* Values for Vendor ID and Device ID shall be patched into the code */ -/* PCI_COMMAND 16 bit Command */ -#define PCI_FBTEN 0x0200 /* Bit 9: Fast Back-To-Back enable */ -#define PCI_SERREN 0x0100 /* Bit 8: SERR enable */ -#define PCI_ADSTEP 0x0080 /* Bit 7: Address Stepping */ -#define PCI_PERREN 0x0040 /* Bit 6: Parity Report Response enable */ -#define PCI_VGA_SNOOP 0x0020 /* Bit 5: VGA palette snoop */ -#define PCI_MWIEN 0x0010 /* Bit 4: Memory write an inv cycl ena */ -#define PCI_SCYCEN 0x0008 /* Bit 3: Special Cycle enable */ -#define PCI_BMEN 0x0004 /* Bit 2: Bus Master enable */ -#define PCI_MEMEN 0x0002 /* Bit 1: Memory Space Access enable */ -#define PCI_IOEN 0x0001 /* Bit 0: IO Space Access enable */ - -/* PCI_STATUS 16 bit Status */ #define PCI_PERR 0x8000 /* Bit 15: Parity Error */ #define PCI_SERR 0x4000 /* Bit 14: Signaled SERR */ #define PCI_RMABORT 0x2000 /* Bit 13: Received Master Abort */ -#define PCI_RTABORT 0x1000 /* Bit 12: Received Target Abort */ #define PCI_STABORT 0x0800 /* Bit 11: Sent Target Abort */ -#define PCI_DEVSEL 0x0600 /* Bit 10..9: DEVSEL Timing */ -#define PCI_DEV_FAST (0<<9) /* fast */ -#define PCI_DEV_MEDIUM (1<<9) /* medium */ -#define PCI_DEV_SLOW (2<<9) /* slow */ #define PCI_DATAPERR 0x0100 /* Bit 8: DATA Parity error detected */ -#define PCI_FB2BCAP 0x0080 /* Bit 7: Fast Back-to-Back Capability */ -#define PCI_UDF 0x0040 /* Bit 6: User Defined Features */ -#define PCI_66MHZCAP 0x0020 /* Bit 5: 66 MHz PCI bus clock capable */ -#define PCI_NEWCAP 0x0010 /* Bit 4: New cap. list implemented */ - #define PCI_ERRBITS (PCI_PERR|PCI_SERR|PCI_RMABORT|PCI_STABORT|PCI_DATAPERR) - -/* PCI_REV_ID 8 bit Revision ID */ -/* PCI_CLASS_CODE 24 bit Class Code */ -/* Byte 2: Base Class (02) */ -/* Byte 1: SubClass (02) */ -/* Byte 0: Programming Interface (00) */ - -/* PCI_CACHE_LSZ 8 bit Cache Line Size */ -/* Possible values: 0,2,4,8,16 */ - -/* PCI_LAT_TIM 8 bit Latency Timer */ - -/* PCI_HEADER_T 8 bit Header Type */ -#define PCI_HD_MF_DEV 0x80 /* Bit 7: 0= single, 1= multi-func dev */ -#define PCI_HD_TYPE 0x7f /* Bit 6..0: Header Layout 0= normal */ - -/* PCI_BIST 8 bit Built-in selftest */ -#define PCI_BIST_CAP 0x80 /* Bit 7: BIST Capable */ -#define PCI_BIST_ST 0x40 /* Bit 6: Start BIST */ -#define PCI_BIST_RET 0x0f /* Bit 3..0: Completion Code */ - -/* PCI_BASE_1ST 32 bit 1st Base address */ -#define PCI_MEMSIZE 0x800L /* use 2 kB Memory Base */ -#define PCI_MEMBASE_BITS 0xfffff800L /* Bit 31..11: Memory Base Address */ -#define PCI_MEMSIZE_BIIS 0x000007f0L /* Bit 10..4: Memory Size Req. */ -#define PCI_PREFEN 0x00000008L /* Bit 3: Prefetchable */ -#define PCI_MEM_TYP 0x00000006L /* Bit 2..1: Memory Type */ -#define PCI_MEM32BIT (0<<1) /* Base addr anywhere in 32 Bit range */ -#define PCI_MEM1M (1<<1) /* Base addr below 1 MegaByte */ -#define PCI_MEM64BIT (2<<1) /* Base addr anywhere in 64 Bit range */ -#define PCI_MEMSPACE 0x00000001L /* Bit 0: Memory Space Indic. */ - -/* PCI_SUB_VID 16 bit Subsystem Vendor ID */ -/* PCI_SUB_ID 16 bit Subsystem ID */ - -/* PCI_BASE_ROM 32 bit Expansion ROM Base Address */ -#define PCI_ROMBASE 0xfffe0000L /* Bit 31..17: ROM BASE address (1st) */ -#define PCI_ROMBASZ 0x0001c000L /* Bit 16..14: Treat as BASE or SIZE */ -#define PCI_ROMSIZE 0x00003800L /* Bit 13..11: ROM Size Requirements */ -#define PCI_ROMEN 0x00000001L /* Bit 0: Address Decode enable */ - -/* PCI_CAP_PTR 8 bit New Capabilities Pointers */ -/* PCI_IRQ_LINE 8 bit Interrupt Line */ -/* PCI_IRQ_PIN 8 bit Interrupt Pin */ -/* PCI_MIN_GNT 8 bit Min_Gnt */ -/* PCI_MAX_LAT 8 bit Max_Lat */ -/* Device Dependent Region */ -/* PCI_OUR_REG (DV) 32 bit Our Register */ -/* PCI_OUR_REG_1 (ML) 32 bit Our Register 1 */ - /* Bit 31..29: reserved */ -#define PCI_PATCH_DIR (3L<<27) /*(DV) Bit 28..27: Ext Patchs direction */ -#define PCI_PATCH_DIR_0 (1L<<27) /*(DV) Type of the pins EXT_PATCHS<1..0> */ -#define PCI_PATCH_DIR_1 (1L<<28) /* 0 = input */ - /* 1 = output */ -#define PCI_EXT_PATCHS (3L<<25) /*(DV) Bit 26..25: Extended Patches */ -#define PCI_EXT_PATCH_0 (1L<<25) /*(DV) */ -#define PCI_EXT_PATCH_1 (1L<<26) /* CLK for MicroWire (ML) */ -#define PCI_VIO (1L<<25) /*(ML) */ -#define PCI_EN_BOOT (1L<<24) /* Bit 24: Enable BOOT via ROM */ - /* 1 = Don't boot with ROM */ - /* 0 = Boot with ROM */ -#define PCI_EN_IO (1L<<23) /* Bit 23: Mapping to IO space */ -#define PCI_EN_FPROM (1L<<22) /* Bit 22: FLASH mapped to mem? */ - /* 1 = Map Flash to Memory */ - /* 0 = Disable all addr. decoding */ -#define PCI_PAGESIZE (3L<<20) /* Bit 21..20: FLASH Page Size */ -#define PCI_PAGE_16 (0L<<20) /* 16 k pages */ -#define PCI_PAGE_32K (1L<<20) /* 32 k pages */ -#define PCI_PAGE_64K (2L<<20) /* 64 k pages */ -#define PCI_PAGE_128K (3L<<20) /* 128 k pages */ - /* Bit 19: reserved (ML) and (DV) */ -#define PCI_PAGEREG (7L<<16) /* Bit 18..16: Page Register */ - /* Bit 15: reserved */ -#define PCI_FORCE_BE (1L<<14) /* Bit 14: Assert all BEs on MR */ -#define PCI_DIS_MRL (1L<<13) /* Bit 13: Disable Mem R Line */ -#define PCI_DIS_MRM (1L<<12) /* Bit 12: Disable Mem R multip */ -#define PCI_DIS_MWI (1L<<11) /* Bit 11: Disable Mem W & inv */ -#define PCI_DISC_CLS (1L<<10) /* Bit 10: Disc: cacheLsz bound */ -#define PCI_BURST_DIS (1L<<9) /* Bit 9: Burst Disable */ -#define PCI_BYTE_SWAP (1L<<8) /*(DV) Bit 8: Byte Swap in DATA */ -#define PCI_SKEW_DAS (0xfL<<4) /* Bit 7..4: Skew Ctrl, DAS Ext */ -#define PCI_SKEW_BASE (0xfL<<0) /* Bit 3..0: Skew Ctrl, Base */ - -/* PCI_OUR_REG_2 (ML) 32 bit Our Register 2 (Monalisa only) */ -#define PCI_VPD_WR_TH (0xffL<<24) /* Bit 24..31 VPD Write Threshold */ -#define PCI_DEV_SEL (0x7fL<<17) /* Bit 17..23 EEPROM Device Select */ -#define PCI_VPD_ROM_SZ (7L<<14) /* Bit 14..16 VPD ROM Size */ - /* Bit 12..13 reserved */ -#define PCI_PATCH_DIR2 (0xfL<<8) /* Bit 8..11 Ext Patchs dir 2..5 */ -#define PCI_PATCH_DIR_2 (1L<<8) /* Bit 8 CS for MicroWire */ -#define PCI_PATCH_DIR_3 (1L<<9) -#define PCI_PATCH_DIR_4 (1L<<10) -#define PCI_PATCH_DIR_5 (1L<<11) -#define PCI_EXT_PATCHS2 (0xfL<<4) /* Bit 4..7 Extended Patches */ -#define PCI_EXT_PATCH_2 (1L<<4) /* Bit 4 CS for MicroWire */ -#define PCI_EXT_PATCH_3 (1L<<5) -#define PCI_EXT_PATCH_4 (1L<<6) -#define PCI_EXT_PATCH_5 (1L<<7) -#define PCI_EN_DUMMY_RD (1L<<3) /* Bit 3 Enable Dummy Read */ -#define PCI_REV_DESC (1L<<2) /* Bit 2 Reverse Desc. Bytes */ -#define PCI_USEADDR64 (1L<<1) /* Bit 1 Use 64 Bit Addresse */ -#define PCI_USEDATA64 (1L<<0) /* Bit 0 Use 64 Bit Data bus ext*/ - -/* Power Management Region */ -/* PCI_PM_CAP_ID 8 bit (ML) Power Management Cap. ID */ -/* PCI_PM_NITEM 8 bit (ML) Next Item Ptr */ -/* PCI_PM_CAP_REG 16 bit (ML) Power Management Capabilities*/ -#define PCI_PME_SUP (0x1f<<11) /* Bit 11..15 PM Manag. Event Support*/ -#define PCI_PM_D2_SUB (1<<10) /* Bit 10 D2 Support Bit */ -#define PCI_PM_D1_SUB (1<<9) /* Bit 9 D1 Support Bit */ - /* Bit 6..8 reserved */ -#define PCI_PM_DSI (1<<5) /* Bit 5 Device Specific Init.*/ -#define PCI_PM_APS (1<<4) /* Bit 4 Auxialiary Power Src */ -#define PCI_PME_CLOCK (1<<3) /* Bit 3 PM Event Clock */ -#define PCI_PM_VER (7<<0) /* Bit 0..2 PM PCI Spec. version */ - -/* PCI_PM_CTL_STS 16 bit (ML) Power Manag. Control/Status */ -#define PCI_PME_STATUS (1<<15) /* Bit 15 PFA doesn't sup. PME#*/ -#define PCI_PM_DAT_SCL (3<<13) /* Bit 13..14 dat reg Scaling factor */ -#define PCI_PM_DAT_SEL (0xf<<9) /* Bit 9..12 PM data selector field */ - /* Bit 7.. 2 reserved */ -#define PCI_PM_STATE (3<<0) /* Bit 0.. 1 Power Management State */ -#define PCI_PM_STATE_D0 (0<<0) /* D0: Operational (default) */ -#define PCI_PM_STATE_D1 (1<<0) /* D1: not supported */ -#define PCI_PM_STATE_D2 (2<<0) /* D2: not supported */ -#define PCI_PM_STATE_D3 (3<<0) /* D3: HOT, Power Down and Reset */ - -/* PCI_PM_DAT_REG 8 bit (ML) Power Manag. Data Register */ -/* VPD Region */ -/* PCI_VPD_CAP_ID 8 bit (ML) VPD Cap. ID */ -/* PCI_VPD_NITEM 8 bit (ML) Next Item Ptr */ -/* PCI_VPD_ADR_REG 16 bit (ML) VPD Address Register */ -#define PCI_VPD_FLAG (1<<15) /* Bit 15 starts VPD rd/wd cycle*/ - -/* PCI_VPD_DAT_REG 32 bit (ML) VPD Data Register */ - /* * Control Register File: * Bank 0