Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Ming Qiao <mqiao@juniper.net>
To:     bhelgaas@google.com, linux-pci@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Ming Qiao <mqiao@juniper.net>, Debjit Ghosh <dghosh@juniper.net>,
        Santhanakrishnan Balraj <sbalraj@juniper.net>,
        Rajat Jain <rajatja@google.com>
Subject: [PATCH 1/3] PCI: Add quirks for Juniper FPGAs to set class code
Date:   Tue, 15 Sep 2020 08:11:01 -0700
Message-Id: <20200915151103.7086-1-mqiao@juniper.net>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from qnc-ubm16-mqiao.juniper.net (66.129.224.68) by BL0PR02CA0086.namprd02.prod.outlook.com (2603:10b6:208:51::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3370.16 via Frontend Transport; Tue, 15 Sep 2020 15:11:30 +0000
X-Mailer: git-send-email 2.10.0
X-Originating-IP: [66.129.224.68]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: a408994d-85a9-4da4-bc81-08d85989a121
X-MS-TrafficTypeDiagnostic: BYAPR05MB4678:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR05MB467890932C4FD3B5E6CD3734AF200@BYAPR05MB4678.namprd05.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:6790;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: OLb2LY6aEJzx0YkyxcilSjVL9OdgWDkS9cGHOTFzjsf/sQ3yr3Cmc8hHbecautdIzs4Sb8HL9+CYMN22epblygF6KUWRFe7UOS60z9Z99XUVRJBR21Ozh59ueMSf5GKBD4LxAptjy9MDL5Tm1ijiWEg58gZpvzhCX8vRwz/frXtZFSdKAAq4vaDoFzde2w2FO8v7rCV+gCI5wlLspUE0GPt5djMVQqbbDmlzwEaO4aE5Aryjm8G9BiHDEQDEVQNW5vBmoEVzUzLOacZWyEfgQZPE5z6lb6N1SReE/E/PiC+/slp81/VJ0xkwdpSY8PGKVO8DO4NT3uCJDnzh7TykC9XcN/SwkbL7ASsZw9tGT7U2Ar1Vv5726IR1SxOeRYBK
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR05MB5592.namprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(396003)(136003)(39860400002)(376002)(346002)(316002)(6666004)(66556008)(86362001)(5660300002)(1076003)(66476007)(66946007)(16526019)(36756003)(186003)(6486002)(54906003)(4326008)(956004)(2616005)(8936002)(26005)(8676002)(52116002)(478600001)(83380400001)(2906002)(7696005);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData: neuMjaOUHH682qg+Mj7Nrhri4vKE7guUOZGdwq6osra2ds0Wg+daRrtGkhcWgE2ErJgWDmej7mVdmEBK2pbmCBgE/E4Qw60Il7Q474mQs480eIA3RjArnOvYM5aj9Q7cDVGarBMA0+e5hpEJ/cr2yy86+QUWvXoPqx5YrWVxgdMR4VT897aRUvR/6u35xxQEo7wMI8m8Wfv2kX4RIHoRT6sQgZ3fisoi0joejdrzb07moaDlgwV1ji7LqJLTvh0YQz0/E4Utxc0OHYY86G69Y82HAX/aWYiN4d5EjGH7X3SWALPaKEMDLQnNhv80FJjdxbK9HV6LwfvgEeZuB28EGbpl8M94Fm/I6qMmfLjx8WWh4063/WGgoGUohGA4+D5iApdo9z3V+P9wTUxEV2p0MCsNZttnjHyf0Qnco1djd4J7CYhh5+cvP2w/E3UYhZt2vs1RyHsgqGChF/e6hBmx5xa5GGUmQeNK6/mM9bcjz25S/xxGAqpl6ANhIK+5vRW2XC2Lx5p+FBE9q8z1m2TsgSa3XAR41h7Itz2P0VS1bQOc3ovvxr/DDYIoZVFGPpLUG3fnS00RZgQOBM0+XtfYisNoq/qOq7Myj4O2ZqTFIP2YK6AbHNPO64FYw/w8Xqi649Xutxr3uKr033aHNugSAw==
X-OriginatorOrg: juniper.net
X-MS-Exchange-CrossTenant-Network-Message-Id: a408994d-85a9-4da4-bc81-08d85989a121
X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB5592.namprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2020 15:11:32.3978
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CcbLGrM/4Jn8bKm+YouVFb5lz8A5dn6eCV7vTbaI5sRua0Fy1j2hoLHlQH4qKFa3XglGGyHHrUAtxW4pDrDdAw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR05MB4678
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687
 definitions=2020-09-15_11:2020-09-15,2020-09-15 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 mlxscore=0
 bulkscore=0 impostorscore=0 priorityscore=1501 lowpriorityscore=0
 malwarescore=0 suspectscore=0 phishscore=0 clxscore=1011 mlxlogscore=928
 adultscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2006250000 definitions=main-2009150127
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Some of the Juniper FPGAs do not report correct PCI class ID, which
would confuse kernel APIs accessing the specific class of devices.
Change them to PCI_CLASS_SYSTEM_OTHER << 8.

Also introduce Juniper vendor ID to be used in the quirks.
    
Signed-off-by: Debjit Ghosh <dghosh@juniper.net>
Signed-off-by: Santhanakrishnan Balraj <sbalraj@juniper.net>
Signed-off-by: Rajat Jain <rajatja@google.com>
Signed-off-by: Ming Qiao <mqiao@juniper.net>
---
 drivers/pci/quirks.c    | 25 +++++++++++++++++++++++++
 include/linux/pci_ids.h |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 2a589b6..61344d2 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -5632,3 +5632,28 @@ static void apex_pci_fixup_class(struct pci_dev *pdev)
 }
 DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a,
 			       PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);
+
+/*
+ * PCI class reported by some Juniper FPGAs is not correct.
+ * Change it to SYSTEM.
+ */
+static void quirk_jnx_fpga(struct pci_dev *dev)
+{
+	if (!dmi_match(DMI_BOARD_VENDOR, "Juniper Networks Inc."))
+		return;
+
+	dev->class = PCI_CLASS_SYSTEM_OTHER << 8;
+}
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x0004, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x006A, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x006B, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x006C, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x006E, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x0079, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x0083, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x0071, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x00A7, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x00A8, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x00A9, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JUNIPER, 0x00AA, quirk_jnx_fpga);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_XILINX, 0x0505, quirk_jnx_fpga);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 1ab1e24..bfbf8f1 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1859,6 +1859,8 @@
 #define PCI_VENDOR_ID_ESDGMBH		0x12fe
 #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
 
+#define PCI_VENDOR_ID_JUNIPER		0X1304
+
 #define PCI_VENDOR_ID_CB		0x1307	/* Measurement Computing */
 
 #define PCI_VENDOR_ID_SIIG		0x131f
-- 
2.10.0