aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.ibm.com>2019-05-31 16:12:39 +1000
committerStewart Smith <stewart@linux.ibm.com>2019-06-03 10:19:59 +1000
commitdf8dd2733162a294f0cecc0f9a24b3a27e6f9a22 (patch)
treef4d76ff80a0bd5082ebaf463d9f52f466346b4ca
parent8e4bb49cb5cdb66785e302127a3cf46b0f9fd9a5 (diff)
downloadskiboot-df8dd2733162a294f0cecc0f9a24b3a27e6f9a22.zip
skiboot-df8dd2733162a294f0cecc0f9a24b3a27e6f9a22.tar.gz
skiboot-df8dd2733162a294f0cecc0f9a24b3a27e6f9a22.tar.bz2
Remove last remnants of OPAL_PCI_SET_PHB_TCE_MEMORY and OPAL_PCI_SET_HUB_TCE_MEMORY
Since we have not supported p5ioc systems since skiboot 5.2, it's pretty safe to just wholesale remove these OPAL calls now. Signed-off-by: Stewart Smith <stewart@linux.ibm.com> Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
-rw-r--r--core/pci-opal.c13
-rw-r--r--hw/cec.c14
-rw-r--r--include/opal-api.h4
3 files changed, 2 insertions, 29 deletions
diff --git a/core/pci-opal.c b/core/pci-opal.c
index a52b02a..0888394 100644
--- a/core/pci-opal.c
+++ b/core/pci-opal.c
@@ -860,19 +860,6 @@ static int64_t opal_pci_set_power_state(uint64_t async_token,
}
opal_call(OPAL_PCI_SET_POWER_STATE, opal_pci_set_power_state, 3);
-static int64_t opal_pci_set_phb_tce_memory(uint64_t phb_id,
- uint64_t tce_mem_addr __unused,
- uint64_t tce_mem_size __unused)
-{
- struct phb *phb = pci_get_phb(phb_id);
-
- if (!phb)
- return OPAL_PARAMETER;
-
- return OPAL_UNSUPPORTED;
-}
-opal_call(OPAL_PCI_SET_PHB_TCE_MEMORY, opal_pci_set_phb_tce_memory, 3);
-
static int64_t opal_pci_get_phb_diag_data(uint64_t phb_id,
void *diag_buffer,
uint64_t diag_buffer_len)
diff --git a/hw/cec.c b/hw/cec.c
index 887a067..5f1e658 100644
--- a/hw/cec.c
+++ b/hw/cec.c
@@ -52,20 +52,6 @@ void cec_reset(void)
}
}
-/* This was only supported by p5ioc, which was dropped */
-static int64_t opal_pci_set_hub_tce_memory(uint64_t hub_id,
- uint64_t tce_mem_addr __unused,
- uint64_t tce_mem_size __unused)
-{
- struct io_hub *hub = cec_get_hub_by_id(hub_id);
-
- if (!hub)
- return OPAL_PARAMETER;
-
- return OPAL_UNSUPPORTED;
-}
-opal_call(OPAL_PCI_SET_HUB_TCE_MEMORY, opal_pci_set_hub_tce_memory, 3);
-
static int64_t opal_pci_get_hub_diag_data(uint64_t hub_id,
void *diag_buffer,
uint64_t diag_buffer_len)
diff --git a/include/opal-api.h b/include/opal-api.h
index b0ad435..535cca8 100644
--- a/include/opal-api.h
+++ b/include/opal-api.h
@@ -70,8 +70,8 @@
#define OPAL_WRITE_NVRAM 8
#define OPAL_HANDLE_INTERRUPT 9
#define OPAL_POLL_EVENTS 10
-#define OPAL_PCI_SET_HUB_TCE_MEMORY 11
-#define OPAL_PCI_SET_PHB_TCE_MEMORY 12
+#define OPAL_PCI_SET_HUB_TCE_MEMORY 11 /* Removed, p5ioc only */
+#define OPAL_PCI_SET_PHB_TCE_MEMORY 12 /* Removed, p5ioc only */
#define OPAL_PCI_CONFIG_READ_BYTE 13
#define OPAL_PCI_CONFIG_READ_HALF_WORD 14
#define OPAL_PCI_CONFIG_READ_WORD 15