[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] [PATCH] x86/EFI: retrieve PCI ROM contents not accessible through BARs


  • To: Jan Beulich <JBeulich@xxxxxxxx>, xen-devel <xen-devel@xxxxxxxxxxxxx>
  • From: Keir Fraser <keir@xxxxxxx>
  • Date: Wed, 16 Jan 2013 15:43:33 +0000
  • Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
  • Delivery-date: Wed, 16 Jan 2013 15:44:08 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xen.org>
  • Thread-index: Ac30AD1YdtRH9O5MKEiYHXSULOYD1Q==
  • Thread-topic: [Xen-devel] [PATCH] x86/EFI: retrieve PCI ROM contents not accessible through BARs

On 16/01/2013 15:17, "Jan Beulich" <JBeulich@xxxxxxxx> wrote:

> Linux 3.8-rc added code to do this, so we need to support this in the
> hypervisor for Dom0 to be able to get at the same information as a
> native kernel.
> 
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

Acked-by: Keir Fraser <keir@xxxxxxx>

> --- a/xen/arch/x86/efi/boot.c
> +++ b/xen/arch/x86/efi/boot.c
> @@ -1,5 +1,6 @@
>  #include "efi.h"
>  #include <efi/efiprot.h>
> +#include <efi/efipciio.h>
>  #include <public/xen.h>
>  #include <xen/compile.h>
>  #include <xen/ctype.h>
> @@ -8,6 +9,7 @@
>  #include <xen/keyhandler.h>
>  #include <xen/lib.h>
>  #include <xen/multiboot.h>
> +#include <xen/pci_regs.h>
>  #include <xen/pfn.h>
>  #if EFI_PAGE_SIZE != PAGE_SIZE
>  # error Cannot use xen/pfn.h here!
> @@ -570,6 +572,92 @@ static void __init edd_put_string(u8 *ds
>  }
>  #define edd_put_string(d, s) edd_put_string(d, ARRAY_SIZE(d), s)
>  
> +static void __init setup_efi_pci(void)
> +{
> +    EFI_STATUS status;
> +    EFI_HANDLE *handles;
> +    static EFI_GUID __initdata pci_guid = EFI_PCI_IO_PROTOCOL;
> +    UINTN i, nr_pci, size = 0;
> +    struct efi_pci_rom *last = NULL;
> +
> +    status = efi_bs->LocateHandle(ByProtocol, &pci_guid, NULL, &size, NULL);
> +    if ( status == EFI_BUFFER_TOO_SMALL )
> +        status = efi_bs->AllocatePool(EfiLoaderData, size, (void
> **)&handles);
> +    if ( !EFI_ERROR(status) )
> +        status = efi_bs->LocateHandle(ByProtocol, &pci_guid, NULL, &size,
> +                                      handles);
> +    if ( EFI_ERROR(status) )
> +        size = 0;
> +
> +    nr_pci = size / sizeof(*handles);
> +    for ( i = 0; i < nr_pci; ++i )
> +    {
> +        EFI_PCI_IO *pci = NULL;
> +        u64 attributes;
> +        struct efi_pci_rom *rom, *va;
> +        UINTN segment, bus, device, function;
> +
> +        status = efi_bs->HandleProtocol(handles[i], &pci_guid, (void
> **)&pci);
> +        if ( EFI_ERROR(status) || !pci || !pci->RomImage || !pci->RomSize )
> +            continue;
> +
> +        status = pci->Attributes(pci, EfiPciIoAttributeOperationGet, 0,
> +                                 &attributes);
> +        if ( EFI_ERROR(status) ||
> +             !(attributes & EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM) ||
> +             EFI_ERROR(pci->GetLocation(pci, &segment, &bus, &device,
> +                       &function)) )
> +            continue;
> +
> +        DisplayUint(segment, 4);
> +        PrintStr(L":");
> +        DisplayUint(bus, 2);
> +        PrintStr(L":");
> +        DisplayUint(device, 2);
> +        PrintStr(L".");
> +        DisplayUint(function, 1);
> +        PrintStr(L": ROM: ");
> +        DisplayUint(pci->RomSize, 0);
> +        PrintStr(L" bytes at ");
> +        DisplayUint((UINTN)pci->RomImage, 0);
> +        PrintStr(newline);
> +
> +        size = pci->RomSize + sizeof(*rom);
> +        status = efi_bs->AllocatePool(EfiRuntimeServicesData, size,
> +                                      (void **)&rom);
> +        if ( EFI_ERROR(status) )
> +            continue;
> +
> +        rom->next = NULL;
> +        rom->size = pci->RomSize;
> +
> +        status = pci->Pci.Read(pci, EfiPciIoWidthUint16, PCI_VENDOR_ID, 1,
> +                               &rom->vendor);
> +        if ( !EFI_ERROR(status) )
> +            status = pci->Pci.Read(pci, EfiPciIoWidthUint16, PCI_DEVICE_ID,
> 1,
> +                                   &rom->devid);
> +        if ( EFI_ERROR(status) )
> +        {
> +            efi_bs->FreePool(rom);
> +            continue;
> +        }
> +
> +        rom->segment = segment;
> +        rom->bus = bus;
> +        rom->devfn = (device << 3) | function;
> +        memcpy(rom->data, pci->RomImage, pci->RomSize);
> +
> +        va = (void *)rom + DIRECTMAP_VIRT_START;
> +        if ( last )
> +            last->next = va;
> +        else
> +            efi_pci_roms = va;
> +        last = rom;
> +    }
> +
> +    efi_bs->FreePool(handles);
> +}
> +
>  static int __init set_color(u32 mask, int bpp, u8 *pos, u8 *sz)
>  {
>     if ( bpp < 0 )
> @@ -1140,6 +1228,9 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SY
>      if (efi.smbios != EFI_INVALID_TABLE_ADDR)
>          dmi_efi_get_table((void *)(long)efi.smbios);
>  
> +    /* Collect PCI ROM contents. */
> +    setup_efi_pci();
> +
>      /* Allocate space for trampoline (in first Mb). */
>      cfg.addr = 0x100000;
>      cfg.size = trampoline_end - trampoline_start;
> --- a/xen/arch/x86/efi/efi.h
> +++ b/xen/arch/x86/efi/efi.h
> @@ -9,6 +9,14 @@
>  #include <xen/spinlock.h>
>  #include <asm/page.h>
>  
> +struct efi_pci_rom {
> +    const struct efi_pci_rom *next;
> +    u16 vendor, devid, segment;
> +    u8 bus, devfn;
> +    unsigned long size;
> +    unsigned char data[];
> +};
> +
>  extern unsigned int efi_num_ct;
>  extern EFI_CONFIGURATION_TABLE *efi_ct;
>  
> @@ -22,5 +30,7 @@ extern void *efi_memmap;
>  
>  extern l4_pgentry_t *efi_l4_pgtable;
>  
> +extern const struct efi_pci_rom *efi_pci_roms;
> +
>  unsigned long efi_rs_enter(void);
>  void efi_rs_leave(unsigned long);
> --- a/xen/arch/x86/efi/runtime.c
> +++ b/xen/arch/x86/efi/runtime.c
> @@ -37,6 +37,8 @@ struct efi __read_mostly efi = {
>  
>  l4_pgentry_t *__read_mostly efi_l4_pgtable;
>  
> +const struct efi_pci_rom *__read_mostly efi_pci_roms;
> +
>  unsigned long efi_rs_enter(void)
>  {
>      unsigned long cr3 = read_cr3();
> @@ -177,6 +179,29 @@ int efi_get_info(uint32_t idx, union xen
>              }
>          }
>          return -ESRCH;
> +    case XEN_FW_EFI_PCI_ROM: {
> +        const struct efi_pci_rom *ent;
> +
> +        for ( ent = efi_pci_roms; ent; ent = ent->next )
> +            if ( info->pci_rom.segment == ent->segment &&
> +                 info->pci_rom.bus == ent->bus &&
> +                 info->pci_rom.devfn == ent->devfn &&
> +                 info->pci_rom.vendor == ent->vendor &&
> +                 info->pci_rom.devid == ent->devid )
> +            {
> +                int rc = 0;
> +
> +                if ( info->pci_rom.size < ent->size )
> +                    rc = -ENOSPC;
> +                else if ( copy_to_guest(info->pci_rom.data,
> +                                        ent->data, ent->size) )
> +                    rc = -EFAULT;
> +                info->pci_rom.size = ent->size;
> +
> +                return rc;
> +            }
> +        return -ESRCH;
> +    }
>      default:
>          return -EINVAL;
>      }
> --- /dev/null
> +++ b/xen/include/efi/efipciio.h
> @@ -0,0 +1,219 @@
> +#ifndef _EFI_PCI_IO_H
> +#define _EFI_PCI_IO_H
> +
> +#define EFI_PCI_IO_PROTOCOL \
> +    { 0x4cf5b200, 0x68b8, 0x4ca5, {0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x02,
> 0x9a} }
> +
> +INTERFACE_DECL(_EFI_PCI_IO);
> +
> +typedef enum {
> +    EfiPciIoWidthUint8,
> +    EfiPciIoWidthUint16,
> +    EfiPciIoWidthUint32,
> +    EfiPciIoWidthUint64,
> +    EfiPciIoWidthFifoUint8,
> +    EfiPciIoWidthFifoUint16,
> +    EfiPciIoWidthFifoUint32,
> +    EfiPciIoWidthFifoUint64,
> +    EfiPciIoWidthFillUint8,
> +    EfiPciIoWidthFillUint16,
> +    EfiPciIoWidthFillUint32,
> +    EfiPciIoWidthFillUint64,
> +    EfiPciIoWidthMaximum
> +} EFI_PCI_IO_PROTOCOL_WIDTH;
> +
> +#define EFI_PCI_IO_PASS_THROUGH_BAR 0xff
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_POLL_IO_MEM) (
> +  IN struct _EFI_PCI_IO *This,
> +  IN EFI_PCI_IO_PROTOCOL_WIDTH  Width,
> +  IN UINT8                      BarIndex,
> +  IN UINT64                     Offset,
> +  IN UINT64                     Mask,
> +  IN UINT64                     Value,
> +  IN UINT64                     Delay,
> +  OUT UINT64                    *Result
> +  );
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_IO_MEM) (
> +  IN struct _EFI_PCI_IO *This,
> +  IN EFI_PCI_IO_PROTOCOL_WIDTH  Width,
> +  IN UINT8                      BarIndex,
> +  IN UINT64                     Offset,
> +  IN UINTN                      Count,
> +  IN OUT VOID                   *Buffer
> +);
> +
> +typedef struct {
> +  EFI_PCI_IO_PROTOCOL_IO_MEM    Read;
> +  EFI_PCI_IO_PROTOCOL_IO_MEM    Write;
> +} EFI_PCI_IO_PROTOCOL_ACCESS;
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_CONFIG) (
> +  IN struct _EFI_PCI_IO *This,
> +  IN EFI_PCI_IO_PROTOCOL_WIDTH  Width,
> +  IN UINT32                     Offset,
> +  IN UINTN                      Count,
> +  IN OUT VOID                   *Buffer
> +);
> +
> +typedef struct {
> +  EFI_PCI_IO_PROTOCOL_CONFIG Read;
> +  EFI_PCI_IO_PROTOCOL_CONFIG Write;
> +} EFI_PCI_IO_PROTOCOL_CONFIG_ACCESS;
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_COPY_MEM) (
> +  IN struct _EFI_PCI_IO *This,
> +  IN EFI_PCI_IO_PROTOCOL_WIDTH  Width,
> +  IN UINT8                      DestBarIndex,
> +  IN UINT64                     DestOffset,
> +  IN UINT8                      SrcBarIndex,
> +  IN UINT64                     SrcOffset,
> +  IN UINTN                      Count
> +  );
> +
> +typedef enum {
> +    EfiPciIoOperationBusMasterRead,
> +    EfiPciIoOperationBusMasterWrite,
> +    EfiPciIoOperationBusMasterCommonBuffer,
> +    EfiPciIoOperationMaximum
> +} EFI_PCI_IO_PROTOCOL_OPERATION;
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_MAP) (
> +  IN struct _EFI_PCI_IO    *This,
> +  IN EFI_PCI_IO_PROTOCOL_OPERATION Operation,
> +  IN VOID                          *HostAddress,
> +  IN OUT UINTN                     *NumberOfBytes,
> +  OUT EFI_PHYSICAL_ADDRESS         *DeviceAddress,
> +  OUT VOID                         **Mapping
> +  );
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_UNMAP) (
> +  IN struct _EFI_PCI_IO *This,
> +  IN VOID                       *Mapping
> +);
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_ALLOCATE_BUFFER) (
> +  IN struct _EFI_PCI_IO *This,
> +  IN EFI_ALLOCATE_TYPE          Type,
> +  IN EFI_MEMORY_TYPE            MemoryType,
> +  IN UINTN                      Pages,
> +  OUT VOID                      **HostAddress,
> +  IN UINT64                     Attributes
> +  );
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_FREE_BUFFER) (
> +  IN struct _EFI_PCI_IO *This,
> +  IN UINTN                      Pages,
> +  IN VOID                       *HostAddress
> +  );
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_FLUSH) (
> +  IN struct _EFI_PCI_IO *This
> +  );
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_GET_LOCATION) (
> +  IN struct _EFI_PCI_IO *This,
> +  OUT UINTN                     *SegmentNumber,
> +  OUT UINTN                     *BusNumber,
> +  OUT UINTN                     *DeviceNumber,
> +  OUT UINTN                     *FunctionNumber
> +  );
> +
> +#define EFI_PCI_IO_ATTRIBUTE_ISA_IO               0x0002
> +#define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO       0x0004
> +#define EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY           0x0008
> +#define EFI_PCI_IO_ATTRIBUTE_VGA_IO               0x0010
> +#define EFI_PCI_IO_ATTRIBUTE_IDE_PRIMARY_IO       0x0020
> +#define EFI_PCI_IO_ATTRIBUTE_IDE_SECONDARY_IO     0x0040
> +#define EFI_PCI_IO_ATTRIBUTE_MEMORY_WRITE_COMBINE 0x0080
> +#define EFI_PCI_IO_ATTRIBUTE_IO                   0x0100
> +#define EFI_PCI_IO_ATTRIBUTE_MEMORY               0x0200
> +#define EFI_PCI_IO_ATTRIBUTE_BUS_MASTER           0x0400
> +#define EFI_PCI_IO_ATTRIBUTE_MEMORY_CACHED        0x0800
> +#define EFI_PCI_IO_ATTRIBUTE_MEMORY_DISABLE       0x1000
> +#define EFI_PCI_IO_ATTRIBUTE_EMBEDDED_DEVICE      0x2000
> +#define EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM         0x4000
> +#define EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE   0x8000
> +#define EFI_PCI_IO_ATTRIBUTE_ISA_IO_16            0x10000
> +#define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO_16    0x20000
> +#define EFI_PCI_IO_ATTRIBUTE_VGA_IO_16            0x40000
> +
> +typedef enum {
> +    EfiPciIoAttributeOperationGet,
> +    EfiPciIoAttributeOperationSet,
> +    EfiPciIoAttributeOperationEnable,
> +    EfiPciIoAttributeOperationDisable,
> +    EfiPciIoAttributeOperationSupported,
> +    EfiPciIoAttributeOperationMaximum
> +} EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION;
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_ATTRIBUTES) (
> +  IN struct _EFI_PCI_IO             *This,
> +  IN EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION Operation,
> +  IN UINT64                                  Attributes,
> +  OUT UINT64                                 *Result OPTIONAL
> +  );
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_GET_BAR_ATTRIBUTES) (
> +  IN struct _EFI_PCI_IO *This,
> +  IN UINT8                      BarIndex,
> +  OUT UINT64                    *Supports OPTIONAL,
> +  OUT VOID                      **Resources OPTIONAL
> +  );
> +
> +typedef
> +EFI_STATUS
> +(EFIAPI *EFI_PCI_IO_PROTOCOL_SET_BAR_ATTRIBUTES) (
> +  IN struct _EFI_PCI_IO *This,
> +  IN UINT64                     Attributes,
> +  IN UINT8                      BarIndex,
> +  IN OUT UINT64                 *Offset,
> +  IN OUT UINT64                 *Length
> +  );
> +
> +typedef struct _EFI_PCI_IO {
> +  EFI_PCI_IO_PROTOCOL_POLL_IO_MEM        PollMem;
> +  EFI_PCI_IO_PROTOCOL_POLL_IO_MEM        PollIo;
> +  EFI_PCI_IO_PROTOCOL_ACCESS             Mem;
> +  EFI_PCI_IO_PROTOCOL_ACCESS             Io;
> +  EFI_PCI_IO_PROTOCOL_CONFIG_ACCESS      Pci;
> +  EFI_PCI_IO_PROTOCOL_COPY_MEM           CopyMem;
> +  EFI_PCI_IO_PROTOCOL_MAP                Map;
> +  EFI_PCI_IO_PROTOCOL_UNMAP              Unmap;
> +  EFI_PCI_IO_PROTOCOL_ALLOCATE_BUFFER    AllocateBuffer;
> +  EFI_PCI_IO_PROTOCOL_FREE_BUFFER        FreeBuffer;
> +  EFI_PCI_IO_PROTOCOL_FLUSH              Flush;
> +  EFI_PCI_IO_PROTOCOL_GET_LOCATION       GetLocation;
> +  EFI_PCI_IO_PROTOCOL_ATTRIBUTES         Attributes;
> +  EFI_PCI_IO_PROTOCOL_GET_BAR_ATTRIBUTES GetBarAttributes;
> +  EFI_PCI_IO_PROTOCOL_SET_BAR_ATTRIBUTES SetBarAttributes;
> +  UINT64                                 RomSize;
> +  VOID                                   *RomImage;
> +} EFI_PCI_IO;
> +
> +#endif /* _EFI_PCI_IO_H */
> --- a/xen/include/public/platform.h
> +++ b/xen/include/public/platform.h
> @@ -218,6 +218,7 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_efi_runtim
>  #define  XEN_FW_EFI_VENDOR         2
>  #define  XEN_FW_EFI_MEM_INFO       3
>  #define  XEN_FW_EFI_RT_VERSION     4
> +#define  XEN_FW_EFI_PCI_ROM        5
>  #define XEN_FW_KBD_SHIFT_FLAGS    5
>  struct xenpf_firmware_info {
>      /* IN variables. */
> @@ -266,6 +267,17 @@ struct xenpf_firmware_info {
>                  uint64_t attr;
>                  uint32_t type;
>              } mem;
> +            struct {
> +                /* IN variables */
> +                uint16_t segment;
> +                uint8_t bus;
> +                uint8_t devfn;
> +                uint16_t vendor;
> +                uint16_t devid;
> +                /* IN/OUT variables */
> +                xen_ulong_t size;
> +                XEN_GUEST_HANDLE(void) data;
> +            } pci_rom;
>          } efi_info; /* XEN_FW_EFI_INFO */
>  
>          /* Int16, Fn02: Get keyboard shift flags. */
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.