From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8ABDA1B580D for ; Wed, 31 Jul 2024 14:22:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722435781; cv=none; b=HeLh0KtOIp4++c4LC4HPNAUKul2GwgYrM8F8F5MqSjuRm7FEoF5Y0bsR86dS0Cj8i3hWhe+rTGnC1nB/uNnAj0BItzBbo/U9GwNRXA1ekE75rxue/o4Cz+fYNqelbITHIrDD/E2ryrCDQijMEk7c1PDAH51WTQr52TtDrXCsIj8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722435781; c=relaxed/simple; bh=fOaj5y/F4hF2tW8PoKwST6yBYB27qSYGz2/n6O27sxE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=sZx7zljHhNWe/U75CMoXum8193wvZ2RSg6Qhn6rxozxlGX1Htyju3GZjpbbvdqTfhgdDxwF3Z5wGoTAXvQtVFpshngQ9pBt9uanRAoJlunB/i5aXc1SqWDxUs9Pyv1nkx1HR+MXxTwHdC16bVF69XLbv88JMv379W35Nf6t+QkE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au; spf=pass smtp.mailfrom=ellerman.id.au; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b=QvUL4ABB; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ellerman.id.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="QvUL4ABB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1722435771; bh=/GGL+wXv2axHl1vUEele1Kgydzhn2gXewxtldoRpqKY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=QvUL4ABB2rLUBOW0YWwbdvmctTxvZI84t9QmKoVgTU2/oRtLoV/nUWlolkje6MTcv eW60ycX/5ZhnPHxKBN5ecOY0SdkNT9+rlV+Z9uVxCy8yuU8JtNrwUSEkLjnzNYjMVP 7aXzp0M4SNZkLZgjr24zKAc6fFJkRIaV9cfhAFWH78O3Pa8lsSO/B1cGVNzWJrtKYC hbaqemtYcmKkKLXoG+U5RfwOcXrhkaEk9fCiNGmFs+NAgWxPaSkEXZzeaft8jQBJo5 82CwvuXhsuvuGyN6cnMxQZCnKXwm9dPul8VnJnszZX8zFXpzjuEC9JFx39e2slXxqQ 5l34wYBEH16Sw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4WYvSq07wKz4wcl; Thu, 1 Aug 2024 00:22:50 +1000 (AEST) From: Michael Ellerman To: Greg Kroah-Hartman , stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Russell Currey , Andrew Donnellan , Stefan Berger , Sasha Levin Subject: Re: [PATCH 6.1 189/440] powerpc/pseries: Move plpks.h to include directory In-Reply-To: <20240730151623.255648651@linuxfoundation.org> References: <20240730151615.753688326@linuxfoundation.org> <20240730151623.255648651@linuxfoundation.org> Date: Thu, 01 Aug 2024 00:22:49 +1000 Message-ID: <874j85prnq.fsf@mail.lhotse> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Greg Kroah-Hartman writes: > 6.1-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Russell Currey > > [ Upstream commit 90b74e305d6b5a444b1283dd7ad1caf6acaa0340 ] > > Move plpks.h from platforms/pseries/ to include/asm/. This is necessary > for later patches to make use of the PLPKS from code in other subsystems. > > Signed-off-by: Russell Currey > Signed-off-by: Andrew Donnellan > Reviewed-by: Stefan Berger > Signed-off-by: Michael Ellerman > Link: https://lore.kernel.org/r/20230210080401.345462-15-ajd@linux.ibm.com > Stable-dep-of: 932bed412170 ("powerpc/kexec_file: fix cpus node update to FDT") I don't see why this is a stable-dep of that commit? 0857beff9c1e and 932bed412170 apply with some fuzz, but otherwise seem fine, and build OK for me here (only tested a few configs). I'm not sure about backporting these plpks commits without some further testing. cheers > Signed-off-by: Sasha Levin > --- > .../powerpc/{platforms/pseries => include/asm}/plpks.h | 10 +++++++--- > arch/powerpc/platforms/pseries/plpks.c | 3 +-- > 2 files changed, 8 insertions(+), 5 deletions(-) > rename arch/powerpc/{platforms/pseries => include/asm}/plpks.h (94%) > > diff --git a/arch/powerpc/platforms/pseries/plpks.h b/arch/powerpc/include/asm/plpks.h > similarity index 94% > rename from arch/powerpc/platforms/pseries/plpks.h > rename to arch/powerpc/include/asm/plpks.h > index 07278a990c2df..44c3d93fb5e7d 100644 > --- a/arch/powerpc/platforms/pseries/plpks.h > +++ b/arch/powerpc/include/asm/plpks.h > @@ -6,8 +6,10 @@ > * Platform keystore for pseries LPAR(PLPKS). > */ > > -#ifndef _PSERIES_PLPKS_H > -#define _PSERIES_PLPKS_H > +#ifndef _ASM_POWERPC_PLPKS_H > +#define _ASM_POWERPC_PLPKS_H > + > +#ifdef CONFIG_PSERIES_PLPKS > > #include > #include > @@ -93,4 +95,6 @@ int plpks_read_fw_var(struct plpks_var *var); > */ > int plpks_read_bootloader_var(struct plpks_var *var); > > -#endif > +#endif // CONFIG_PSERIES_PLPKS > + > +#endif // _ASM_POWERPC_PLPKS_H > diff --git a/arch/powerpc/platforms/pseries/plpks.c b/arch/powerpc/platforms/pseries/plpks.c > index d54188a355c9c..1c43c4febd3da 100644 > --- a/arch/powerpc/platforms/pseries/plpks.c > +++ b/arch/powerpc/platforms/pseries/plpks.c > @@ -18,8 +18,7 @@ > #include > #include > #include > - > -#include "plpks.h" > +#include > > static u8 *ospassword; > static u16 ospasswordlength; > -- > 2.43.0