From 2d2f19a6ca5134651db3e9fcde666cf9f28959fa Mon Sep 17 00:00:00 2001 From: Sathish Kumar Date: Mon, 13 Feb 2017 15:52:07 +0530 Subject: [PATCH] qcacmn: Add device id for multi-node support in Hawkeye M2M Include Hawkeye emulation PCI device ids in probe list to enable PCI based emulation platform to support multiple nodes. Change-Id: I539c099912e5e7fa4865f57a139f5e75c1b06462 CRs-Fixed: 1090092 --- dp/inc/cdp_txrx_cmn_reg.h | 2 ++ hif/src/hif_main.c | 2 ++ hif/src/hif_main.h | 4 +++- hif/src/pcie/if_pci.c | 4 +++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dp/inc/cdp_txrx_cmn_reg.h b/dp/inc/cdp_txrx_cmn_reg.h index b98b94ca44d1..cf00dc405300 100644 --- a/dp/inc/cdp_txrx_cmn_reg.h +++ b/dp/inc/cdp_txrx_cmn_reg.h @@ -63,6 +63,8 @@ static inline ol_txrx_soc_handle cdp_soc_attach(u_int16_t devid, case QCA8074_DEVICE_ID: /* Hawekeye */ case RUMIM2M_DEVICE_ID_NODE0: /*lithium emulation */ case RUMIM2M_DEVICE_ID_NODE1: /*lithium emulation */ + case RUMIM2M_DEVICE_ID_NODE2: /*lithium emulation */ + case RUMIM2M_DEVICE_ID_NODE3: /*lithium emulation */ return dp_soc_attach_wifi3(scn, hif_handle, htc_handle, qdf_dev, dp_ol_if_ops); break; diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c index 7a1f5e402113..c8847c36b52e 100644 --- a/hif/src/hif_main.c +++ b/hif/src/hif_main.c @@ -761,6 +761,8 @@ int hif_get_device_type(uint32_t device_id, case QCA8074_DEVICE_ID: case RUMIM2M_DEVICE_ID_NODE0: case RUMIM2M_DEVICE_ID_NODE1: + case RUMIM2M_DEVICE_ID_NODE2: + case RUMIM2M_DEVICE_ID_NODE3: *hif_type = HIF_TYPE_QCA8074; *target_type = TARGET_TYPE_QCA8074; HIF_INFO(" *********** QCA8074 *************\n"); diff --git a/hif/src/hif_main.h b/hif/src/hif_main.h index a80359bbc55d..481440ddd318 100644 --- a/hif/src/hif_main.h +++ b/hif/src/hif_main.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -101,6 +101,8 @@ emulation purpose */ #define RUMIM2M_DEVICE_ID_NODE0 0xabc0 #define RUMIM2M_DEVICE_ID_NODE1 0xabc1 +#define RUMIM2M_DEVICE_ID_NODE2 0xabc2 +#define RUMIM2M_DEVICE_ID_NODE3 0xabc3 #define HIF_GET_PCI_SOFTC(scn) ((struct hif_pci_softc *)scn) #define HIF_GET_CE_STATE(scn) ((struct HIF_CE_state *)scn) diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c index 35e6c869a36b..830b0ba3515c 100644 --- a/hif/src/pcie/if_pci.c +++ b/hif/src/pcie/if_pci.c @@ -2223,7 +2223,9 @@ static int hif_enable_pci(struct hif_pci_softc *sc, /* Hawkeye emulation specific change */ if ((device_id == RUMIM2M_DEVICE_ID_NODE0) || - (device_id == RUMIM2M_DEVICE_ID_NODE1)) { + (device_id == RUMIM2M_DEVICE_ID_NODE1) || + (device_id == RUMIM2M_DEVICE_ID_NODE2) || + (device_id == RUMIM2M_DEVICE_ID_NODE3)) { mem = mem + 0x0c000000; sc->mem = mem; HIF_INFO("%s: Changing PCI mem base to %p\n",