Commit 7c306cb1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fpga-for-v6.3-rc1' of... 

Merge tag 'fpga-for-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next

Xu writes:

FPGA Manager changes for 6.3-rc1

Microchip:

- Ivan's reliability improvements for Microchip Polarfire FPGA

FPGA DFL doc:

- Randy and Yilun's kernel doc fixes.
  The 2 patches, "fpga: dfl: more kernel-doc corrections" &
  "fpga: dfl: kernel-doc corrections" conflicts with Matthew's FPGA
  patch "fpga: dfl: add basic support for DFHv1" on tty-next. Yilun
  resolved the conflicts on:
  --branch for-next https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git/


  On that branch, Matthew's patch is applied first then kernel doc fixes
  follow.

Intel m10 bmc MFD & sub devices:

- Lee's topic branch merged, to support new BMC board type with new
  PMCI interface to host, as well as its new sub devices.

Signed-off-by: default avatarXu Yilun <yilun.xu@intel.com>

* tag 'fpga-for-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: bridge: return errors in the show() method of the "state" attribute
  fpga: dfl: more kernel-doc corrections
  fpga: dfl: kernel-doc corrections
  fpga: microchip-spi: separate data frame write routine
  fpga: microchip-spi: rewrite status polling in a time measurable way
  fpga: microchip-spi: move SPI I/O buffers out of stack
  mfd: intel-m10-bmc: Add PMCI driver
  fpga: m10bmc-sec: Make rsu status type specific
  fpga: m10bmc-sec: Create helpers for rsu status/progress checks
  mfd: intel-m10-bmc: Prefix register defines with M10BMC_N3000
  fpga: intel-m10-bmc: Rework flash read/write
  mfd: intel-m10-bmc: Support multiple CSR register layouts
  mfd: intel-m10-bmc: Split into core and spi specific parts
  mfd: intel-m10-bmc: Rename the local variables
  mfd: intel-m10-bmc: Create m10bmc_platform_info for type specific info
  mfd: intel-m10-bmc: Add missing includes to header
parents 99ba2ad1 9d18515e

Documentation/ABI/testing/sysfs-driver-intel-m10-bmc

+4 −4
Original line number Diff line number Diff line 
What:		/sys/bus/spi/devices/.../bmc_version

What:		/sys/bus/.../drivers/intel-m10-bmc/.../bmc_version

Date:		June 2020

KernelVersion:	5.10

Contact:	Xu Yilun <yilun.xu@intel.com>
@@ -6,7 +6,7 @@ Description: Read only. Returns the hardware build version of Intel 
		MAX10 BMC chip.

		Format: "0x%x".



What:		/sys/bus/spi/devices/.../bmcfw_version

What:		/sys/bus/.../drivers/intel-m10-bmc/.../bmcfw_version

Date:		June 2020

KernelVersion:	5.10

Contact:	Xu Yilun <yilun.xu@intel.com>
@@ -14,7 +14,7 @@ Description: Read only. Returns the firmware version of Intel MAX10 
		BMC chip.

		Format: "0x%x".



What:		/sys/bus/spi/devices/.../mac_address

What:		/sys/bus/.../drivers/intel-m10-bmc/.../mac_address

Date:		January 2021

KernelVersion:  5.12

Contact:	Russ Weight <russell.h.weight@intel.com>
@@ -25,7 +25,7 @@ Description: Read only. Returns the first MAC address in a block 
		space.

		Format: "%02x:%02x:%02x:%02x:%02x:%02x".



What:		/sys/bus/spi/devices/.../mac_count

What:		/sys/bus/.../drivers/intel-m10-bmc/.../mac_count

Date:		January 2021

KernelVersion:  5.12

Contact:	Russ Weight <russell.h.weight@intel.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10575,7 +10575,7 @@ S: Maintained 
F:	Documentation/ABI/testing/sysfs-driver-intel-m10-bmc

F:	Documentation/hwmon/intel-m10-bmc-hwmon.rst

F:	drivers/hwmon/intel-m10-bmc-hwmon.c

F:	drivers/mfd/intel-m10-bmc.c

F:	drivers/mfd/intel-m10-bmc*

F:	include/linux/mfd/intel-m10-bmc.h









INTEL MENLOW THERMAL DRIVER


































drivers/fpga/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -246,7 +246,7 @@ config FPGA_MGR_VERSAL_FPGA

















config FPGA_M10_BMC_SEC_UPDATE









	tristate "Intel MAX10 BMC Secure Update driver"









	depends on MFD_INTEL_M10_BMC









	depends on MFD_INTEL_M10_BMC_CORE









	select FW_LOADER









	select FW_UPLOAD









	help


































drivers/fpga/dfl-afu-region.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -39,6 +39,7 @@ static struct dfl_afu_mmio_region *get_region_by_index(struct dfl_afu *afu,







/**









 * afu_mmio_region_add - add a mmio region to given feature dev.









 *









 * @pdata: afu platform device's pdata.









 * @region_index: region index.









 * @region_size: region size.









 * @phys: region's physical address of this region.


































drivers/fpga/dfl-afu.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -41,7 +41,7 @@ struct dfl_afu_mmio_region {







};



















/**









 * struct fpga_afu_dma_region - afu DMA region data structure









 * struct dfl_afu_dma_region - afu DMA region data structure









 *









 * @user_addr: region userspace virtual address.









 * @length: region length.