Re: [GIT PULL] Please pull powerpc/linux.git powerpc-6.4-1 tag

2023-04-28 Thread Michael Ellerman
Linus Torvalds  writes:
> On Fri, Apr 28, 2023 at 2:44 AM Michael Ellerman  wrote:
>>
>>   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git 
>> tags/powerpc-6.4-1
>
> Odd. Your shortlog has this:
>
>> Michael Ellerman (46):
>>   powerpc/configs: Make pseries_defconfig an alias for ppc64le_guest
>
> that removed the 'pseries_defconfig' file, but then your diffstat
>
>>  arch/powerpc/configs/pq2fads_defconfig  
>>  |  80 
>>  arch/powerpc/include/asm/atomic.h   
>>  |  53 +-
>
> doesn't have it, resulting in the summary not matching what I get:
>
>> 278 files changed, 2672 insertions(+), 9188 deletions(-)
>
> versus my
>
>  279 files changed, 2690 insertions(+), 9528 deletions(-)
>
> and I see no obvious reason for it.
>
> I wonder if your test-merge just didn't remove the file (it did have a
> conflict due to the IXGB driver removal), and that's why.

Yeah my fault, looks like I edited the conflict in powernv_defconfig and
then did 'git add arch/powerpc/configs/*' which added back the pseries
one.

> Anyway, I'm not entirely sure about the mismatch of the end result,
> but it seems to be due to that one defconfig file, and I think my
> merge is fine. But please double-check.

Yep looks fine, thanks.

cheers


Re: [GIT PULL] Please pull powerpc/linux.git powerpc-6.4-1 tag

2023-04-28 Thread pr-tracker-bot
The pull request you sent on Fri, 28 Apr 2023 19:44:02 +1000:

> https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git 
> tags/powerpc-6.4-1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/70cc1b5307e8ee3076fdf2ecbeb89eb973aa0ff7

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html


Re: [GIT PULL] Please pull powerpc/linux.git powerpc-6.4-1 tag

2023-04-28 Thread Linus Torvalds
On Fri, Apr 28, 2023 at 2:44 AM Michael Ellerman  wrote:
>
>   https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git 
> tags/powerpc-6.4-1

Odd. Your shortlog has this:

> Michael Ellerman (46):
>   powerpc/configs: Make pseries_defconfig an alias for ppc64le_guest

that removed the 'pseries_defconfig' file, but then your diffstat

>  arch/powerpc/configs/pq2fads_defconfig   
> |  80 
>  arch/powerpc/include/asm/atomic.h
> |  53 +-

doesn't have it, resulting in the summary not matching what I get:

> 278 files changed, 2672 insertions(+), 9188 deletions(-)

versus my

 279 files changed, 2690 insertions(+), 9528 deletions(-)

and I see no obvious reason for it.

I wonder if your test-merge just didn't remove the file (it did have a
conflict due to the IXGB driver removal), and that's why.

Anyway, I'm not entirely sure about the mismatch of the end result,
but it seems to be due to that one defconfig file, and I think my
merge is fine. But please double-check.

   Linus


[GIT PULL] Please pull powerpc/linux.git powerpc-6.4-1 tag

2023-04-28 Thread Michael Ellerman
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hi Linus,

Please pull powerpc updates for 6.4.

A pretty small batch, but a couple of conflicts. 

The first is in drivers/gpu/drm/amd/display/Kconfig. The correct resolution is:

  select DRM_AMD_DC_FP if (X86 || (PPC64 && ALTIVEC) || (ARM64 && 
KERNEL_MODE_NEON && !CC_IS_CLANG))

The second is in our defconfigs, where e485f3a6eae0 ("ixgb: Remove ixgb
driver") removed CONFIG_IXGB which conflicts with our updates, in particular in
powernv_defconfig where we added CONFIG_IGB=y.

cheers

Notable out of area changes:
  drivers/cpuidle/cpuidle-pseries.c   # 88990745c934 cpuidle: pseries: Mark 
->enter() functions as __cpuidle
  drivers/gpu/drm/amd/display/Kconfig # 78f0929884d4 powerpc/64: Always 
build with 128-bit long double
  drivers/vfio/vfio_iommu_spapr_tce.c # a940904443e4 powerpc/iommu: Add 
iommu_ops to report capabilities and allow blocking domains

The following changes since commit eeac8ede17557680855031c6f305ece2378af326:

  Linux 6.3-rc2 (2023-03-12 16:36:44 -0700)

are available in the git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git 
tags/powerpc-6.4-1

for you to fetch changes up to 169f8997968ab620d750d9a45e15c5288d498356:

  powerpc/64s: Disable pcrel code model on Clang (2023-04-26 16:21:33 +1000)

- - --
powerpc updates for 6.4

 - Add support for building the kernel using PC-relative addressing on Power10.

 - Allow HV KVM guests on Power10 to use prefixed instructions.

 - Unify support for the P2020 CPU (85xx) into a single machine description.

 - Always build the 64-bit kernel with 128-bit long double.

 - Drop support for several obsolete 2000's era development boards as
   identified by Paul Gortmaker.

 - A series fixing VFIO on Power since some generic changes.

 - Various other small features and fixes.

Thanks to: Alexey Kardashevskiy, Andrew Donnellan, Benjamin Gray, Bo Liu,
Christophe Leroy, Dan Carpenter, David Binderman, Ira Weiny, Joel Stanley,
Kajol Jain, Kautuk Consul, Liang He, Luis Chamberlain, Masahiro Yamada, Michael
Neuling, Nathan Chancellor, Nathan Lynch, Nicholas Miehlbradt, Nicholas Piggin,
Nick Desaulniers, Nysal Jan K.A, Pali Rohár, Paul Gortmaker, Paul Mackerras,
Petr Vaněk, Randy Dunlap, Rob Herring, Sachin Sant, Sean Christopherson, Segher
Boessenkool, Timothy Pearson.

- - --
Alexey Kardashevskiy (3):
  powerpc/iommu: Add "borrowing" iommu_table_group_ops
  powerpc/pci_64: Init pcibios subsys a bit later
  powerpc/iommu: Add iommu_ops to report capabilities and allow blocking 
domains

Andrew Donnellan (1):
  powerpc/pseries: Add FW_FEATURE_PLPKS feature flag

Benjamin Gray (10):
  selftests/powerpc: Use CLEAN macro to fix make warning
  selftests/powerpc: Pass make context to children
  selftests/powerpc: Make dd output quiet
  selftests/powerpc/dscr: Correct typos
  selftests/powerpc: Move bind_to_cpu() to utils.h
  selftests/powerpc: Allow bind_to_cpu() to automatically pick CPU
  selftests/powerpc/dscr: Add lockstep test cases to DSCR explicit tests
  selftests/powerpc/dscr: Improve DSCR explicit random test case
  selftests/powerpc/dscr: Speed up DSCR sysfs tests
  selftests/powerpc/dscr: Restore timeout to DSCR selftests

Bo Liu (1):
  powerpc: Fix a kernel-doc warning

Christophe Leroy (15):
  powerpc/machdep: Make machine name const
  powerpc/machdep: Define 'compatible' property in ppc_md and use it
  powerpc/platforms: Use 'compatible' property for simple cases
  powerpc/47x: Split ppc47x machine in two
  powerpc/gamecube|wii : Use machine_device_initcall()
  powerpc/85xx: Fix function naming for p1023_rdb platform
  powerpc: Make generic_calibrate_decr() the default
  powerpc/perf: Properly detect mpc7450 family
  powerpc/fsl_uli1575: Misc cleanup
  powerpc/85xx: Remove DBG() macro
  powerpc/85xx: mpc85xx_{ds/rdb} compact the call to mpic_alloc()
  powerpc/85xx: mpc85xx_{ds/rdb} replace BUG_ON() by WARN_ON()
  powerpc/85xx: mpc85xx_{ds/rdb} replace prink by pr_xxx macro
  powerpc/85xx: Remove #ifdefs CONFIG_PPC_I8259 in mpc85xx_ds
  powerpc/85xx: Remove #ifdef CONFIG_QUICC_ENGINE in mpc85xx_rdb

Ira Weiny (1):
  powerpc: Remove memcpy_page_flushcache()

Joel Stanley (1):
  powerpc: Remove duplicate SPRN_HSRR definitions

Kajol Jain (1):
  selftests/powerpc/pmu: Fix sample field check in the 
mmcra_thresh_marked_sample_test

Kautuk Consul (1):
  KVM: PPC: Book3S HV: kvmppc_hv_entry: remove .global scope

Liang He (1):
  macintosh/windfarm_smu_sat: Add missing of_node_put()

Luis Chamberlain (2):
  powerpc: Simplify sysctl registration for powersave_nap_ctl_table
  powerpc: Simplify sysctl registration for nmi_wd_lpm_factor_ctl_table

Michael Ellerman (46):
  KVM: PPC: