lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH v6 11/12] platform/x86: simatic-ipc: drop custom P2SB bar code
    From
    Hi,

    On 6/6/22 18:41, Andy Shevchenko wrote:
    > From: Henning Schild <henning.schild@siemens.com>
    >
    > The two drivers that used to use this have been switched over to the
    > common P2SB accessor, so this code is not needed any longer.
    >
    > Signed-off-by: Henning Schild <henning.schild@siemens.com>
    > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

    Thanks, patch looks good to me:

    Reviewed-by: Hans de Goede <hdegoede@redhat.com>

    Also Ack for merging this through the MFD tree.

    Regards,

    Hans

    > ---
    > drivers/platform/x86/simatic-ipc.c | 38 -------------------
    > .../platform_data/x86/simatic-ipc-base.h | 2 -
    > 2 files changed, 40 deletions(-)
    >
    > diff --git a/drivers/platform/x86/simatic-ipc.c b/drivers/platform/x86/simatic-ipc.c
    > index b599cda5ba3c..26c35e1660cb 100644
    > --- a/drivers/platform/x86/simatic-ipc.c
    > +++ b/drivers/platform/x86/simatic-ipc.c
    > @@ -101,44 +101,6 @@ static int register_platform_devices(u32 station_id)
    > return 0;
    > }
    >
    > -/* FIXME: this should eventually be done with generic P2SB discovery code
    > - * the individual drivers for watchdogs and LEDs access memory that implements
    > - * GPIO, but pinctrl will not come up because of missing ACPI entries
    > - *
    > - * While there is no conflict a cleaner solution would be to somehow bring up
    > - * pinctrl even with these ACPI entries missing, and base the drivers on pinctrl.
    > - * After which the following function could be dropped, together with the code
    > - * poking the memory.
    > - */
    > -/*
    > - * Get membase address from PCI, used in leds and wdt module. Here we read
    > - * the bar0. The final address calculation is done in the appropriate modules
    > - */
    > -u32 simatic_ipc_get_membase0(unsigned int p2sb)
    > -{
    > - struct pci_bus *bus;
    > - u32 bar0 = 0;
    > - /*
    > - * The GPIO memory is in bar0 of the hidden P2SB device.
    > - * Unhide the device to have a quick look at it, before we hide it
    > - * again.
    > - * Also grab the pci rescan lock so that device does not get discovered
    > - * and remapped while it is visible.
    > - * This code is inspired by drivers/mfd/lpc_ich.c
    > - */
    > - bus = pci_find_bus(0, 0);
    > - pci_lock_rescan_remove();
    > - pci_bus_write_config_byte(bus, p2sb, 0xE1, 0x0);
    > - pci_bus_read_config_dword(bus, p2sb, PCI_BASE_ADDRESS_0, &bar0);
    > -
    > - bar0 &= ~0xf;
    > - pci_bus_write_config_byte(bus, p2sb, 0xE1, 0x1);
    > - pci_unlock_rescan_remove();
    > -
    > - return bar0;
    > -}
    > -EXPORT_SYMBOL(simatic_ipc_get_membase0);
    > -
    > static int __init simatic_ipc_init_module(void)
    > {
    > const struct dmi_system_id *match;
    > diff --git a/include/linux/platform_data/x86/simatic-ipc-base.h b/include/linux/platform_data/x86/simatic-ipc-base.h
    > index 62d2bc774067..39fefd48cf4d 100644
    > --- a/include/linux/platform_data/x86/simatic-ipc-base.h
    > +++ b/include/linux/platform_data/x86/simatic-ipc-base.h
    > @@ -24,6 +24,4 @@ struct simatic_ipc_platform {
    > u8 devmode;
    > };
    >
    > -u32 simatic_ipc_get_membase0(unsigned int p2sb);
    > -
    > #endif /* __PLATFORM_DATA_X86_SIMATIC_IPC_BASE_H */

    \
     
     \ /
      Last update: 2022-06-07 19:16    [W:4.572 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site