| Message ID | 20190531061351.22973-39-stewart@linux.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Big documentation cleanup/expansion | expand |
On 31/5/19 4:12 pm, Stewart Smith wrote: > 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> These calls have also completely disappeared from Linux (except the OPAL call wrapper). Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com> > --- > core/pci-opal.c | 13 ------------- > hw/cec.c | 14 -------------- > include/opal-api.h | 4 ++-- > 3 files changed, 2 insertions(+), 29 deletions(-) > > diff --git a/core/pci-opal.c b/core/pci-opal.c > index a52b02a9d845..08883949e629 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; I appreciate that this stub continues to check the validity of the PHB ID... > - > - 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 887a0672c0a5..5f1e658c9a7d 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 b0ad435539fb..535cca88f5c2 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 >
Andrew Donnellan <ajd@linux.ibm.com> writes: > On 31/5/19 4:12 pm, Stewart Smith wrote: >> 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> > > These calls have also completely disappeared from Linux (except the OPAL > call wrapper). Yeah, a next step is to clean up Linux from all this ancient and never used stuff too. Especially considering I asked the last two OPAL-on-POWER7 users the other day if they still use it and the answer was no.
diff --git a/core/pci-opal.c b/core/pci-opal.c index a52b02a9d845..08883949e629 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 887a0672c0a5..5f1e658c9a7d 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 b0ad435539fb..535cca88f5c2 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
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> --- core/pci-opal.c | 13 ------------- hw/cec.c | 14 -------------- include/opal-api.h | 4 ++-- 3 files changed, 2 insertions(+), 29 deletions(-)