diff for duplicates of <20080612221848.GR30916@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 5c7d4f0..b1f17f8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ -=46rom: Robert Jennings <rcj@linux.vnet.ibm.com> +From: Robert Jennings <rcj@linux.vnet.ibm.com> In support of Cooperative Memory Overcommitment (CMO) this moves -get_longbusy_msecs() out of the ehca and ehea drivers and into the=20 +get_longbusy_msecs() out of the ehca and ehea drivers and into the architecture's hvcall header as plpar_get_longbusy_msecs. Some firmware calls made in pSeries platform iommu code will need to share this functionality. @@ -19,15 +19,13 @@ I missed copying netdev on this patch the first time. 4 files changed, 31 insertions(+), 44 deletions(-) Index: b/drivers/infiniband/hw/ehca/hcp_if.c -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +=================================================================== --- a/drivers/infiniband/hw/ehca/hcp_if.c +++ b/drivers/infiniband/hw/ehca/hcp_if.c @@ -90,26 +90,6 @@ -=20 + static DEFINE_SPINLOCK(hcall_lock); -=20 + -static u32 get_longbusy_msecs(int longbusy_rc) -{ - switch (longbusy_rc) { @@ -53,57 +51,52 @@ Index: b/drivers/infiniband/hw/ehca/hcp_if.c unsigned long arg2, @@ -139,7 +119,7 @@ static long ehca_plpar_hcall_norets(unsi spin_unlock_irqrestore(&hcall_lock, flags); -=20 + if (H_IS_LONG_BUSY(ret)) { -- sleep_msecs =3D get_longbusy_msecs(ret); -+ sleep_msecs =3D plpar_get_longbusy_msecs(ret); +- sleep_msecs = get_longbusy_msecs(ret); ++ sleep_msecs = plpar_get_longbusy_msecs(ret); msleep_interruptible(sleep_msecs); continue; } @@ -192,7 +172,7 @@ static long ehca_plpar_hcall9(unsigned l spin_unlock_irqrestore(&hcall_lock, flags); -=20 + if (H_IS_LONG_BUSY(ret)) { -- sleep_msecs =3D get_longbusy_msecs(ret); -+ sleep_msecs =3D plpar_get_longbusy_msecs(ret); +- sleep_msecs = get_longbusy_msecs(ret); ++ sleep_msecs = plpar_get_longbusy_msecs(ret); msleep_interruptible(sleep_msecs); continue; } Index: b/drivers/net/ehea/ehea_phyp.c -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +=================================================================== --- a/drivers/net/ehea/ehea_phyp.c +++ b/drivers/net/ehea/ehea_phyp.c @@ -61,7 +61,7 @@ static long ehea_plpar_hcall_norets(unsi arg5, arg6, arg7); -=20 + if (H_IS_LONG_BUSY(ret)) { -- sleep_msecs =3D get_longbusy_msecs(ret); -+ sleep_msecs =3D plpar_get_longbusy_msecs(ret); +- sleep_msecs = get_longbusy_msecs(ret); ++ sleep_msecs = plpar_get_longbusy_msecs(ret); msleep_interruptible(sleep_msecs); continue; } @@ -102,7 +102,7 @@ static long ehea_plpar_hcall9(unsigned l arg6, arg7, arg8, arg9); -=20 + if (H_IS_LONG_BUSY(ret)) { -- sleep_msecs =3D get_longbusy_msecs(ret); -+ sleep_msecs =3D plpar_get_longbusy_msecs(ret); +- sleep_msecs = get_longbusy_msecs(ret); ++ sleep_msecs = plpar_get_longbusy_msecs(ret); msleep_interruptible(sleep_msecs); continue; } Index: b/drivers/net/ehea/ehea_phyp.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +=================================================================== --- a/drivers/net/ehea/ehea_phyp.h +++ b/drivers/net/ehea/ehea_phyp.h @@ -40,26 +40,6 @@ - * hcp_* - structures, variables and functions releated to Hypervisor Cal= -ls + * hcp_* - structures, variables and functions releated to Hypervisor Calls */ -=20 + -static inline u32 get_longbusy_msecs(int long_busy_ret_code) -{ - switch (long_busy_ret_code) { @@ -124,22 +117,18 @@ ls - } -} - - /* Number of pages which can be registered at once by H_REGISTER_HEA_RPAGE= -S */ + /* Number of pages which can be registered at once by H_REGISTER_HEA_RPAGES */ #define EHEA_MAX_RPAGE 512 -=20 + Index: b/include/asm-powerpc/hvcall.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +=================================================================== --- a/include/asm-powerpc/hvcall.h +++ b/include/asm-powerpc/hvcall.h @@ -222,6 +222,33 @@ #ifndef __ASSEMBLY__ -=20 + /** -+ * plpar_get_longbusy_msecs: - Return number of msecs for H_LONG_BUSY* res= -ponse ++ * plpar_get_longbusy_msecs: - Return number of msecs for H_LONG_BUSY* response + * @long_busy_ret_code: The H_LONG_BUSY_* constant to process + * + * This returns the number of msecs that corresponds to an H_LONG_BUSY_* @@ -166,7 +155,6 @@ ponse +} + +/** - * plpar_hcall_norets: - Make a pseries hypervisor call with no return arg= -uments + * plpar_hcall_norets: - Make a pseries hypervisor call with no return arguments * @opcode: The hypervisor call to make. * diff --git a/a/content_digest b/N1/content_digest index e86e167..ff8a4f3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,16 +3,18 @@ "Subject\0[PATCH 10/19] [repost] powerpc: move get_longbusy_msecs out of ehca/ehea\0" "Date\0Thu, 12 Jun 2008 17:18:48 -0500\0" "To\0paulus@samba.org\0" - "Cc\0netdev@vger.kernel.org" - linuxppc-dev@ozlabs.org - David Darrington <ddarring@linux.vnet.ibm.com> - " Brian King <brking@linux.vnet.ibm.com>\0" + "Cc\0linuxppc-dev@ozlabs.org" + netdev@vger.kernel.org + Brian King <brking@linux.vnet.ibm.com> + Santiago Leon <santil@us.ibm.com> + Nathan Fontenot <nfont@austin.ibm.com> + " David Darrington <ddarring@linux.vnet.ibm.com>\0" "\00:1\0" "b\0" - "=46rom: Robert Jennings <rcj@linux.vnet.ibm.com>\n" + "From: Robert Jennings <rcj@linux.vnet.ibm.com>\n" "\n" "In support of Cooperative Memory Overcommitment (CMO) this moves\n" - "get_longbusy_msecs() out of the ehca and ehea drivers and into the=20\n" + "get_longbusy_msecs() out of the ehca and ehea drivers and into the \n" "architecture's hvcall header as plpar_get_longbusy_msecs. Some firmware\n" "calls made in pSeries platform iommu code will need to share this\n" "functionality.\n" @@ -30,15 +32,13 @@ " 4 files changed, 31 insertions(+), 44 deletions(-)\n" "\n" "Index: b/drivers/infiniband/hw/ehca/hcp_if.c\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "===================================================================\n" "--- a/drivers/infiniband/hw/ehca/hcp_if.c\n" "+++ b/drivers/infiniband/hw/ehca/hcp_if.c\n" "@@ -90,26 +90,6 @@\n" - "=20\n" + " \n" " static DEFINE_SPINLOCK(hcall_lock);\n" - "=20\n" + " \n" "-static u32 get_longbusy_msecs(int longbusy_rc)\n" "-{\n" "-\tswitch (longbusy_rc) {\n" @@ -64,57 +64,52 @@ " \t\t\t\t unsigned long arg2,\n" "@@ -139,7 +119,7 @@ static long ehca_plpar_hcall_norets(unsi\n" " \t\t\tspin_unlock_irqrestore(&hcall_lock, flags);\n" - "=20\n" + " \n" " \t\tif (H_IS_LONG_BUSY(ret)) {\n" - "-\t\t\tsleep_msecs =3D get_longbusy_msecs(ret);\n" - "+\t\t\tsleep_msecs =3D plpar_get_longbusy_msecs(ret);\n" + "-\t\t\tsleep_msecs = get_longbusy_msecs(ret);\n" + "+\t\t\tsleep_msecs = plpar_get_longbusy_msecs(ret);\n" " \t\t\tmsleep_interruptible(sleep_msecs);\n" " \t\t\tcontinue;\n" " \t\t}\n" "@@ -192,7 +172,7 @@ static long ehca_plpar_hcall9(unsigned l\n" " \t\t\tspin_unlock_irqrestore(&hcall_lock, flags);\n" - "=20\n" + " \n" " \t\tif (H_IS_LONG_BUSY(ret)) {\n" - "-\t\t\tsleep_msecs =3D get_longbusy_msecs(ret);\n" - "+\t\t\tsleep_msecs =3D plpar_get_longbusy_msecs(ret);\n" + "-\t\t\tsleep_msecs = get_longbusy_msecs(ret);\n" + "+\t\t\tsleep_msecs = plpar_get_longbusy_msecs(ret);\n" " \t\t\tmsleep_interruptible(sleep_msecs);\n" " \t\t\tcontinue;\n" " \t\t}\n" "Index: b/drivers/net/ehea/ehea_phyp.c\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "===================================================================\n" "--- a/drivers/net/ehea/ehea_phyp.c\n" "+++ b/drivers/net/ehea/ehea_phyp.c\n" "@@ -61,7 +61,7 @@ static long ehea_plpar_hcall_norets(unsi\n" " \t\t\t\t\t arg5, arg6, arg7);\n" - "=20\n" + " \n" " \t\tif (H_IS_LONG_BUSY(ret)) {\n" - "-\t\t\tsleep_msecs =3D get_longbusy_msecs(ret);\n" - "+\t\t\tsleep_msecs =3D plpar_get_longbusy_msecs(ret);\n" + "-\t\t\tsleep_msecs = get_longbusy_msecs(ret);\n" + "+\t\t\tsleep_msecs = plpar_get_longbusy_msecs(ret);\n" " \t\t\tmsleep_interruptible(sleep_msecs);\n" " \t\t\tcontinue;\n" " \t\t}\n" "@@ -102,7 +102,7 @@ static long ehea_plpar_hcall9(unsigned l\n" " \t\t\t\t arg6, arg7, arg8, arg9);\n" - "=20\n" + " \n" " \t\tif (H_IS_LONG_BUSY(ret)) {\n" - "-\t\t\tsleep_msecs =3D get_longbusy_msecs(ret);\n" - "+\t\t\tsleep_msecs =3D plpar_get_longbusy_msecs(ret);\n" + "-\t\t\tsleep_msecs = get_longbusy_msecs(ret);\n" + "+\t\t\tsleep_msecs = plpar_get_longbusy_msecs(ret);\n" " \t\t\tmsleep_interruptible(sleep_msecs);\n" " \t\t\tcontinue;\n" " \t\t}\n" "Index: b/drivers/net/ehea/ehea_phyp.h\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "===================================================================\n" "--- a/drivers/net/ehea/ehea_phyp.h\n" "+++ b/drivers/net/ehea/ehea_phyp.h\n" "@@ -40,26 +40,6 @@\n" - " * hcp_* - structures, variables and functions releated to Hypervisor Cal=\n" - "ls\n" + " * hcp_* - structures, variables and functions releated to Hypervisor Calls\n" " */\n" - "=20\n" + " \n" "-static inline u32 get_longbusy_msecs(int long_busy_ret_code)\n" "-{\n" "-\tswitch (long_busy_ret_code) {\n" @@ -135,22 +130,18 @@ "-\t}\n" "-}\n" "-\n" - " /* Number of pages which can be registered at once by H_REGISTER_HEA_RPAGE=\n" - "S */\n" + " /* Number of pages which can be registered at once by H_REGISTER_HEA_RPAGES */\n" " #define EHEA_MAX_RPAGE 512\n" - "=20\n" + " \n" "Index: b/include/asm-powerpc/hvcall.h\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "===================================================================\n" "--- a/include/asm-powerpc/hvcall.h\n" "+++ b/include/asm-powerpc/hvcall.h\n" "@@ -222,6 +222,33 @@\n" " #ifndef __ASSEMBLY__\n" - "=20\n" + " \n" " /**\n" - "+ * plpar_get_longbusy_msecs: - Return number of msecs for H_LONG_BUSY* res=\n" - "ponse\n" + "+ * plpar_get_longbusy_msecs: - Return number of msecs for H_LONG_BUSY* response\n" "+ * @long_busy_ret_code: The H_LONG_BUSY_* constant to process\n" "+ *\n" "+ * This returns the number of msecs that corresponds to an H_LONG_BUSY_*\n" @@ -177,9 +168,8 @@ "+}\n" "+\n" "+/**\n" - " * plpar_hcall_norets: - Make a pseries hypervisor call with no return arg=\n" - "uments\n" + " * plpar_hcall_norets: - Make a pseries hypervisor call with no return arguments\n" " * @opcode: The hypervisor call to make.\n" * -1b1be9e6287b42b0f0da1e408f42aa504d145f5fdffcfe64ed4dcd52e426c944 +77980257040a65f0035a44a963502fe2797f75073849e0156af8a36df62fa20b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.